Skip to content

Commit

Permalink
fixed core/pom.rb and regenerate pom.xml files
Browse files Browse the repository at this point in the history
@mkristian
mkristian committed Apr 11, 2017
1 parent 603545f commit 4b3a598
Showing 4 changed files with 75 additions and 77 deletions.
5 changes: 2 additions & 3 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -258,9 +258,8 @@
end


plugin ( :shade,
:dependencies => [ 'org.ow2.asm:asm-all:6.0_ALPHA' ]
) do
plugin :shade do
jar 'org.ow2.asm:asm-all:6.0_ALPHA'
execute_goals( 'shade',
:id => 'create lib/jruby.jar',
:phase => 'package',
89 changes: 44 additions & 45 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -17,55 +17,55 @@ DO NOT MODIFIY - GENERATED CODE
<artifactId>jruby-core</artifactId>
<name>JRuby Core</name>
<properties>
<release.dir>release</release.dir>
<version.ruby>2.3.3</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>
<version.ruby.revision>56859</version.ruby.revision>
<dest.lib.dir>${lib.dir}</dest.lib.dir>
<tzdata.version>2013d</tzdata.version>
<jruby.basedir>${basedir}/..</jruby.basedir>
<rubyspec.1.8.dir>${rubyspec.dir}/1.8</rubyspec.1.8.dir>
<main.basedir>${project.parent.basedir}</main.basedir>
<build.date>${maven.build.timestamp}</build.date>
<prawn.stable.version>0.4.1</prawn.stable.version>
<jruby.gem.home>lib/ruby/gems/shared</jruby.gem.home>
<spec.dir>spec</spec.dir>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
<mspec.dir>${spec.dir}/mspec</mspec.dir>
<install4j.executable>/Applications/install4j 4/bin/install4jc</install4j.executable>
<jay.bin>jay</jay.bin>
<test.classes.dir>${test.dir}/target/test-classes</test.classes.dir>
<test.dir>test</test.dir>
<mspec.bin>${mspec.dir}/bin/mspec</mspec.bin>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<jruby.test.memory.permgen>2G</jruby.test.memory.permgen>
<Constants.java>org/jruby/runtime/Constants.java</Constants.java>
<rails.dir>${test.dir}/rails</rails.dir>
<test.results.dir>${build.dir}/test-results</test.results.dir>
<jruby.compile.memory>2G</jruby.compile.memory>
<build.lib.dir>test/target</build.lib.dir>
<create.sources.jar>false</create.sources.jar>
<anno.sources>${project.basedir}/target/generated-sources</anno.sources>
<jruby.launch.memory>1024M</jruby.launch.memory>
<jruby.win32ole.gem>jruby-win32ole</jruby.win32ole.gem>
<jflex.bin>jflex</jflex.bin>
<parser.dir>core/src/main/java/org/jruby/parser</parser.dir>
<installer.gems>${jruby.win32ole.gem}</installer.gems>
<version.ruby.major>2.3</version.ruby.major>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
<prawn.git.repo>git://github.com/sandal/prawn.git</prawn.git.repo>
<version.ruby.minor>3</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>
<mspec.tar.file>${build.dir}/mspec.tgz</mspec.tar.file>
<build.dir>target</build.dir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<maven.test.skip>true</maven.test.skip>
<rubyspec.1.8.dir>${rubyspec.dir}/1.8</rubyspec.1.8.dir>
<jruby.launch.memory>1024M</jruby.launch.memory>
<jruby.compile.memory>2G</jruby.compile.memory>
<version.ruby.major>2.3</version.ruby.major>
<release.dir>release</release.dir>
<create.sources.jar>false</create.sources.jar>
<jruby.test.memory>3G</jruby.test.memory>
<lib.dir>lib</lib.dir>
<rails.dir>${test.dir}/rails</rails.dir>
<parser.dir>core/src/main/java/org/jruby/parser</parser.dir>
<jruby.basedir>${basedir}/..</jruby.basedir>
<rubyspec.dir>${spec.dir}/ruby</rubyspec.dir>
<version.ruby.revision>56859</version.ruby.revision>
<jruby.test.memory>3G</jruby.test.memory>
<mspec.dir>${spec.dir}/mspec</mspec.dir>
<build.date>${maven.build.timestamp}</build.date>
<main.basedir>${project.parent.basedir}</main.basedir>
<tzdata.scope>provided</tzdata.scope>
<test.results.dir>${build.dir}/test-results</test.results.dir>
<prawn.stable.version>0.4.1</prawn.stable.version>
<mspec.tar.file>${build.dir}/mspec.tgz</mspec.tar.file>
<build.lib.dir>test/target</build.lib.dir>
<anno.sources>${project.basedir}/target/generated-sources</anno.sources>
<rake.args></rake.args>
<test.dir>test</test.dir>
<jflex.bin>jflex</jflex.bin>
<jruby.win32ole.gem>jruby-win32ole</jruby.win32ole.gem>
<mspec.bin>${mspec.dir}/bin/mspec</mspec.bin>
<jruby.gem.home>lib/ruby/gems/shared</jruby.gem.home>
<Constants.java>org/jruby/runtime/Constants.java</Constants.java>
<test.classes.dir>${test.dir}/target/test-classes</test.classes.dir>
<pkg.dir>${build.dir}/pkg</pkg.dir>
<rails.git.repo>git://github.com/rails/rails.git</rails.git.repo>
<prawn.dir>${test.dir}/prawn</prawn.dir>
<spec.tags.dir>${spec.dir}/tags</spec.tags.dir>
</properties>
<dependencies>
<dependency>
@@ -595,14 +595,6 @@ DO NOT MODIFIY - GENERATED CODE
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<version>6.0_ALPHA</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>create lib/jruby.jar</id>
@@ -627,6 +619,13 @@ DO NOT MODIFIY - GENERATED CODE
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<version>6.0_ALPHA</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
4 changes: 2 additions & 2 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -17,12 +17,12 @@ DO NOT MODIFIY - GENERATED CODE
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Lib Setup</name>
<properties>
<jruby.complete.home>${project.build.outputDirectory}/META-INF/jruby.home</jruby.complete.home>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<jruby.complete.gems>${jruby.complete.home}/lib/ruby/gems/shared</jruby.complete.gems>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<gem.home>${basedir}/ruby/gems/shared</gem.home>
<jruby.plugins.version>1.1.2</jruby.plugins.version>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<jruby.complete.home>${project.build.outputDirectory}/META-INF/jruby.home</jruby.complete.home>
</properties>
<dependencies>
<dependency>
54 changes: 27 additions & 27 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -104,38 +104,38 @@ DO NOT MODIFIY - GENERATED CODE
</site>
</distributionManagement>
<properties>
<rspec-core.version>3.4.4</rspec-core.version>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<racc.version>1.4.14</racc.version>
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<jruby.basedir>${project.basedir}</jruby.basedir>
<minitest.version>5.4.1</minitest.version>
<ant.version>1.9.2</ant.version>
<diff-lcs.version>1.1.3</diff-lcs.version>
<jffi.version>1.2.15</jffi.version>
<rake.version>10.4.2</rake.version>
<jruby-launcher.version>1.1.1</jruby-launcher.version>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<asm.version>5.0.4</asm.version>
<rspec-expectations.version>3.4.0</rspec-expectations.version>
<its.osgi>osgi*/pom.xml</its.osgi>
<base.javac.version>1.7</base.javac.version>
<test-unit.version>3.1.1</test-unit.version>
<rdoc.version>4.2.0</rdoc.version>
<rspec.version>3.4.0</rspec.version>
<base.java.version>1.7</base.java.version>
<jruby.basedir>${project.basedir}</jruby.basedir>
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<rspec-mocks.version>3.4.1</rspec-mocks.version>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<main.basedir>${project.basedir}</main.basedir>
<invoker.skip>true</invoker.skip>
<json.version>1.8.3</json.version>
<jar-dependencies.version>0.3.10</jar-dependencies.version>
<power_assert.version>0.2.3</power_assert.version>
<version.jruby>${project.version}</version.jruby>
<main.basedir>${project.basedir}</main.basedir>
<github.global.server>github</github.global.server>
<joda.time.version>2.8.2</joda.time.version>
<rake.version>10.4.2</rake.version>
<base.javac.version>1.7</base.javac.version>
<test-unit.version>3.1.1</test-unit.version>
<asm.version>5.0.4</asm.version>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<rspec-core.version>3.4.4</rspec-core.version>
<power_assert.version>0.2.3</power_assert.version>
<minitest.version>5.4.1</minitest.version>
<base.java.version>1.7</base.java.version>
<rspec-support.version>3.4.1</rspec-support.version>
<rdoc.version>4.2.0</rdoc.version>
<rspec-expectations.version>3.4.0</rspec-expectations.version>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<json.version>1.8.3</json.version>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<its.osgi>osgi*/pom.xml</its.osgi>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<diff-lcs.version>1.1.3</diff-lcs.version>
<ant.version>1.9.2</ant.version>
<racc.version>1.4.14</racc.version>
<joda.time.version>2.8.2</joda.time.version>
<github.global.server>github</github.global.server>
<jar-dependencies.version>0.3.10</jar-dependencies.version>
<jruby-launcher.version>1.1.1</jruby-launcher.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -662,8 +662,8 @@ DO NOT MODIFIY - GENERATED CODE
<module>maven</module>
</modules>
<properties>
<its.osgi>no-excludes/pom.xml</its.osgi>
<invoker.skip>false</invoker.skip>
<its.osgi>no-excludes/pom.xml</its.osgi>
</properties>
</profile>
<profile>
@@ -685,8 +685,8 @@ DO NOT MODIFIY - GENERATED CODE
<module>maven</module>
</modules>
<properties>
<its.j2ee>no-excludes/pom.xml</its.j2ee>
<invoker.skip>false</invoker.skip>
<its.j2ee>no-excludes/pom.xml</its.j2ee>
</properties>
</profile>
<profile>

0 comments on commit 4b3a598

Please sign in to comment.