Skip to content

Commit fb15aa4

Browse files
committed
[build] no attaching for gem type + update jruby used
1 parent 85c1946 commit fb15aa4

File tree

2 files changed

+4
-36
lines changed

2 files changed

+4
-36
lines changed

Mavenfile

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,17 @@ default_bc_version = File.read File.expand_path('lib/jopenssl/version.rb', File.
104104
default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
105105

106106
properties( 'jruby.plugins.version' => '1.1.6',
107-
'jruby.versions' => '1.7.26',
107+
'jruby.versions' => '9.1.17.0',
108108
'bc.versions' => default_bc_version,
109109
'invoker.test' => '${bc.versions}',
110110
# allow to skip all tests with -Dmaven.test.skip
111111
'invoker.skip' => '${maven.test.skip}',
112112
'runit.dir' => 'src/test/ruby/**/test_*.rb',
113113
# use this version of jruby for ALL the jruby-maven-plugins
114-
'jruby.version' => '9.1.17.0',
114+
'jruby.version' => '9.1.17.0', # Java 7 compatible till supporting JRuby 1.7
115115
# dump pom.xml as readonly when running 'rmvn'
116116
'polyglot.dump.pom' => 'pom.xml',
117-
'polyglot.dump.readonly' => true,
118-
'tesla.dump.pom' => 'pom.xml',
119-
'tesla.dump.readonly' => true )
117+
'polyglot.dump.readonly' => true )
120118

121119
# make sure we have the embedded jars in place before we run runit plugin
122120
plugin! :dependency do
@@ -171,12 +169,6 @@ end
171169
}
172170

173171
profile :id => 'release' do
174-
plugin :source do
175-
execute_goal :jar, id: 'attach-sources'
176-
end
177-
plugin :javadoc do
178-
execute_goal :jar, id: 'attach-javadoc'
179-
end
180172
plugin :gpg, '1.6' do
181173
execute_goal :sign, :phase => :verify
182174
end

pom.xml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,11 @@ DO NOT MODIFIY - GENERATED CODE
6565
<invoker.test>${bc.versions}</invoker.test>
6666
<jruby.plugins.version>1.1.6</jruby.plugins.version>
6767
<jruby.version>9.1.17.0</jruby.version>
68-
<jruby.versions>1.7.26</jruby.versions>
68+
<jruby.versions>9.1.17.0</jruby.versions>
6969
<mavengem.wagon.version>0.2.1</mavengem.wagon.version>
7070
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
7171
<polyglot.dump.readonly>true</polyglot.dump.readonly>
7272
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
73-
<tesla.dump.pom>pom.xml</tesla.dump.pom>
74-
<tesla.dump.readonly>true</tesla.dump.readonly>
7573
</properties>
7674
<dependencies>
7775
<dependency>
@@ -1051,28 +1049,6 @@ DO NOT MODIFIY - GENERATED CODE
10511049
<id>release</id>
10521050
<build>
10531051
<plugins>
1054-
<plugin>
1055-
<artifactId>maven-source-plugin</artifactId>
1056-
<executions>
1057-
<execution>
1058-
<id>attach-sources</id>
1059-
<goals>
1060-
<goal>jar</goal>
1061-
</goals>
1062-
</execution>
1063-
</executions>
1064-
</plugin>
1065-
<plugin>
1066-
<artifactId>maven-javadoc-plugin</artifactId>
1067-
<executions>
1068-
<execution>
1069-
<id>attach-javadoc</id>
1070-
<goals>
1071-
<goal>jar</goal>
1072-
</goals>
1073-
</execution>
1074-
</executions>
1075-
</plugin>
10761052
<plugin>
10771053
<artifactId>maven-gpg-plugin</artifactId>
10781054
<version>1.6</version>

0 commit comments

Comments
 (0)