maven-tools 0.29.0 → 0.29.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -427,7 +427,7 @@ module Maven
|
|
|
427
427
|
if args.last.is_a?(Hash)
|
|
428
428
|
options = args.delete(args.last)
|
|
429
429
|
unless options.key?(:git) || options.key?(:path)
|
|
430
|
-
if options[:platforms].nil? || is_jruby_platform(*(options[:platforms] || []))
|
|
430
|
+
if (options[:platform].nil? && options[:platforms].nil?) || is_jruby_platform(*(options[:platform] || options[:platforms] || []))
|
|
431
431
|
group = options[:group] || options[:groups]
|
|
432
432
|
if group
|
|
433
433
|
[group].flatten.each do |g|
|
|
@@ -49,14 +49,13 @@ module Maven
|
|
|
49
49
|
|
|
50
50
|
self.properties = {
|
|
51
51
|
"jruby.version" => versions[:jruby_version],
|
|
52
|
-
"jetty.version" => versions[:jetty_plugin],
|
|
53
52
|
"rails.env" => "development",
|
|
54
53
|
"gem.includeRubygemsInTestResources" => false
|
|
55
54
|
}.merge(self.properties)
|
|
56
55
|
|
|
57
56
|
plugin(:rails3) do |rails|
|
|
58
57
|
rails.version = "${jruby.plugins.version}" unless rails.version
|
|
59
|
-
rails.in_phase(:validate).execute_goal(:initialize)
|
|
58
|
+
rails.in_phase(:validate).execute_goal(:initialize)
|
|
60
59
|
end
|
|
61
60
|
|
|
62
61
|
plugin(:war, versions[:war_plugin]) unless plugin?(:war)
|
|
@@ -99,76 +98,6 @@ module Maven
|
|
|
99
98
|
}.merge(prod.properties)
|
|
100
99
|
end
|
|
101
100
|
|
|
102
|
-
profile(:war).plugin("org.mortbay.jetty:jetty-maven-plugin",
|
|
103
|
-
"${jetty.version}")
|
|
104
|
-
|
|
105
|
-
profile(:run) do |run|
|
|
106
|
-
overrideDescriptor = '${project.build.directory}/jetty/override-${rails.env}-web.xml'
|
|
107
|
-
run.activation.by_default
|
|
108
|
-
run.plugin("org.mortbay.jetty:jetty-maven-plugin",
|
|
109
|
-
"${jetty.version}") do |jetty|
|
|
110
|
-
options = {
|
|
111
|
-
:webAppConfig => {
|
|
112
|
-
:overrideDescriptor => overrideDescriptor
|
|
113
|
-
},
|
|
114
|
-
:systemProperties => {
|
|
115
|
-
:systemProperty => {
|
|
116
|
-
:name => 'jbundle.skip',
|
|
117
|
-
:value => 'true'
|
|
118
|
-
}
|
|
119
|
-
},
|
|
120
|
-
:connectors => <<-XML
|
|
121
|
-
|
|
122
|
-
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
|
|
123
|
-
<port>8080</port>
|
|
124
|
-
</connector>
|
|
125
|
-
<connector implementation="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
|
|
126
|
-
<port>8443</port>
|
|
127
|
-
<keystore>${project.basedir}/src/test/resources/server.keystore</keystore>
|
|
128
|
-
<keyPassword>123456</keyPassword>
|
|
129
|
-
<password>123456</password>
|
|
130
|
-
</connector>
|
|
131
|
-
XML
|
|
132
|
-
}
|
|
133
|
-
options[:webXml] = 'config/web.xml' if File.exists?('config/web.xml')
|
|
134
|
-
jetty.with options
|
|
135
|
-
end
|
|
136
|
-
end
|
|
137
|
-
profile(:warshell) do |exec|
|
|
138
|
-
exec.plugin_repository('kos').url = 'http://opensource.kantega.no/nexus/content/groups/public/'
|
|
139
|
-
exec.plugin('org.simplericity.jettyconsole:jetty-console-maven-plugin', '1.42').execution do |jetty|
|
|
140
|
-
jetty.execute_goal(:createconsole)
|
|
141
|
-
jetty.configuration.comment <<-TEXT
|
|
142
|
-
see http://simplericity.com/2009/11/10/1257880778509.html for more info
|
|
143
|
-
-->
|
|
144
|
-
<!--
|
|
145
|
-
<backgroundImage>${basedir}/src/main/jettyconsole/puffin.jpg</backgroundImage>
|
|
146
|
-
<additionalDependencies>
|
|
147
|
-
<additionalDependency>
|
|
148
|
-
<artifactId>jetty-console-winsrv-plugin</artifactId>
|
|
149
|
-
</additionalDependency>
|
|
150
|
-
<additionalDependency>
|
|
151
|
-
<artifactId>jetty-console-requestlog-plugin</artifactId>
|
|
152
|
-
</additionalDependency>
|
|
153
|
-
<additionalDependency>
|
|
154
|
-
<artifactId>jetty-console-log4j-plugin</artifactId>
|
|
155
|
-
</additionalDependency>
|
|
156
|
-
<additionalDependency>
|
|
157
|
-
<artifactId>jetty-console-jettyxml-plugin</artifactId>
|
|
158
|
-
</additionalDependency>
|
|
159
|
-
<additionalDependency>
|
|
160
|
-
<artifactId>jetty-console-ajp-plugin</artifactId>
|
|
161
|
-
</additionalDependency>
|
|
162
|
-
<additionalDependency>
|
|
163
|
-
<artifactId>jetty-console-gzip-plugin</artifactId>
|
|
164
|
-
</additionalDependency>
|
|
165
|
-
<additionalDependency>
|
|
166
|
-
<artifactId>jetty-console-startstop-plugin</artifactId>
|
|
167
|
-
</additionalDependency>
|
|
168
|
-
</additionalDependencies>
|
|
169
|
-
TEXT
|
|
170
|
-
end
|
|
171
|
-
end
|
|
172
101
|
end
|
|
173
102
|
end
|
|
174
103
|
end
|
data/lib/maven/tools/version.rb
CHANGED
data/lib/maven/tools/versions.rb
CHANGED
metadata
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
name: maven-tools
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
4
|
prerelease:
|
|
5
|
-
version: 0.29.
|
|
5
|
+
version: 0.29.1
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
8
8
|
- Kristian Meier
|
|
@@ -10,7 +10,7 @@ autorequire:
|
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
12
|
|
|
13
|
-
date: 2012-06-
|
|
13
|
+
date: 2012-06-13 00:00:00 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rake
|