maven-tools 1.0.11 → 1.0.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (82) hide show
  1. checksums.yaml +4 -4
  2. data/lib/maven/tools/dsl.rb +35 -5
  3. data/lib/maven/tools/dsl/gemspec.rb +2 -2
  4. data/lib/maven/tools/dsl/jars_lock.rb +60 -0
  5. data/lib/maven/tools/dsl/profile_gemspec.rb +0 -5
  6. data/lib/maven/tools/dsl/project_gemspec.rb +0 -5
  7. data/lib/maven/tools/gemfile_lock.rb +8 -1
  8. data/lib/maven/tools/version.rb +1 -1
  9. data/lib/maven/tools/versions.rb +4 -3
  10. data/maven-tools.gemspec +1 -1
  11. data/spec/dsl/gemspec_spec/jars_and_poms.xml +1 -1
  12. data/spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml +1 -1
  13. data/spec/dsl/gemspec_spec/maven-tools.xml +1 -1
  14. data/spec/dsl/jarfile_lock_spec/Jarfile.legacy.lock +52 -0
  15. data/spec/dsl/jarfile_lock_spec/Jarfile.lock +75 -0
  16. data/spec/dsl/profile_gemspec_spec/jars_and_poms.xml +1 -1
  17. data/spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml +1 -1
  18. data/spec/dsl/profile_gemspec_spec/maven-tools.xml +1 -1
  19. data/spec/dsl/profile_gemspec_spec/no_gems.xml +1 -1
  20. data/spec/dsl/profile_gemspec_spec/snapshot.xml +1 -1
  21. data/spec/dsl/profile_gemspec_spec/unknown_license.xml +1 -1
  22. data/spec/dsl/project_gemspec_spec/extended.xml +1 -1
  23. data/spec/dsl/project_gemspec_spec/jars_and_poms.xml +1 -1
  24. data/spec/dsl/project_gemspec_spec/jars_and_poms_include_jars.xml +1 -1
  25. data/spec/dsl/project_gemspec_spec/maven-tools.xml +1 -1
  26. data/spec/dsl/project_gemspec_spec/no_gems.xml +1 -1
  27. data/spec/dsl/project_gemspec_spec/profile.xml +1 -1
  28. data/spec/dsl/project_gemspec_spec/snapshot.xml +1 -1
  29. data/spec/dsl/project_gemspec_spec/unknown_license.xml +1 -1
  30. data/spec/gemfile/pom.xml +1 -1
  31. data/spec/gemfile_include_jars/pom.xml +1 -1
  32. data/spec/gemfile_with_access_to_model/pom.xml +1 -1
  33. data/spec/gemfile_with_custom_source/pom.xml +1 -1
  34. data/spec/gemfile_with_custom_source_and_custom_jarname/pom.xml +1 -1
  35. data/spec/gemfile_with_extras/pom.xml +1 -1
  36. data/spec/gemfile_with_groups/pom.xml +2 -1
  37. data/spec/gemfile_with_groups_and_lockfile/pom.xml +2 -1
  38. data/spec/gemfile_with_jars_lock/Gemfile +0 -0
  39. data/spec/gemfile_with_jars_lock/Jars.lock +2 -0
  40. data/spec/gemfile_with_jars_lock/Mavenfile +5 -0
  41. data/spec/gemfile_with_jars_lock/pom.xml +70 -0
  42. data/spec/gemfile_with_lock/Gemfile.lock +3 -0
  43. data/spec/gemfile_with_lock/pom.xml +9 -1
  44. data/spec/gemfile_with_path/pom.xml +3 -2
  45. data/spec/gemfile_with_platforms/pom.xml +2 -1
  46. data/spec/gemfile_with_source/pom.xml +1 -1
  47. data/spec/gemfile_with_source_and_custom_jarname/pom.xml +1 -1
  48. data/spec/gemfile_with_source_and_no_jar/pom.xml +1 -1
  49. data/spec/gemfile_with_test_group/pom.xml +2 -1
  50. data/spec/gemfile_without_gemspec/pom.xml +2 -1
  51. data/spec/gemspec/pom.xml +1 -1
  52. data/spec/gemspec_in_profile/pom.xml +1 -1
  53. data/spec/gemspec_include_jars/pom.xml +1 -1
  54. data/spec/gemspec_no_rubygems_repo/pom.xml +1 -1
  55. data/spec/gemspec_prerelease/pom.xml +1 -1
  56. data/spec/gemspec_prerelease_snapshot/pom.xml +1 -1
  57. data/spec/gemspec_with_access_to_model/pom.xml +1 -1
  58. data/spec/gemspec_with_custom_source/pom.xml +1 -1
  59. data/spec/gemspec_with_custom_source_and_custom_jarname/pom.xml +1 -1
  60. data/spec/gemspec_with_extras/pom.xml +1 -1
  61. data/spec/gemspec_with_jar_dependencies/pom.xml +1 -1
  62. data/spec/gemspec_with_jars_lock/Jars.lock +2 -0
  63. data/spec/gemspec_with_jars_lock/Mavenfile +5 -0
  64. data/spec/gemspec_with_jars_lock/bouncy-castle-java.gemspec +20 -0
  65. data/spec/gemspec_with_jars_lock/bouncy-castle-version.rb +4 -0
  66. data/spec/gemspec_with_jars_lock/pom.xml +109 -0
  67. data/spec/gemspec_with_prereleased_dependency/pom.xml +1 -1
  68. data/spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml +1 -1
  69. data/spec/gemspec_with_source/pom.xml +1 -1
  70. data/spec/gemspec_with_source_and_custom_jarname/pom.xml +1 -1
  71. data/spec/gemspec_with_source_and_no_jar/pom.xml +1 -1
  72. data/spec/mavenfile_jrubyJar/Mavenfile +9 -0
  73. data/spec/mavenfile_jrubyJar/pom.xml +41 -0
  74. data/spec/mavenfile_jrubyWar/Mavenfile +9 -0
  75. data/spec/mavenfile_jrubyWar/pom.xml +41 -0
  76. data/spec/pom_from_jarfile_and_empty_lock/Jarfile.lock +0 -0
  77. data/spec/pom_from_jarfile_and_lock/Jarfile.lock +4 -0
  78. data/spec/pom_from_jarfile_and_skip_lock/Jarfile.lock +4 -0
  79. data/spec/pom_from_jarfile_with_repos/pom.rb +3 -0
  80. data/spec/pom_from_jarfile_with_repos/pom.xml +0 -1
  81. metadata +200 -163
  82. data/spec/pom_from_jarfile_with_repos/Mavenfile +0 -1
@@ -6,7 +6,7 @@
6
6
  <name>BASEDIR</name>
7
7
  <properties>
8
8
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
9
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
9
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
10
10
  </properties>
11
11
  <dependencies>
12
12
  <dependency>
@@ -6,7 +6,7 @@
6
6
  <name>profile_gemspec_spec</name>
7
7
  <properties>
8
8
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
9
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
9
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
10
10
  </properties>
11
11
  <repositories>
12
12
  <repository>
@@ -6,7 +6,7 @@
6
6
  <name>profile_gemspec_spec</name>
7
7
  <properties>
8
8
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
9
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
9
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
10
10
  </properties>
11
11
  <repositories>
12
12
  <repository>
@@ -6,7 +6,7 @@
6
6
  <name>profile_gemspec_spec</name>
7
7
  <properties>
8
8
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
9
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
9
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
10
10
  </properties>
11
11
  <repositories>
12
12
  <repository>
@@ -26,7 +26,7 @@
26
26
  </scm>
27
27
  <properties>
28
28
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
29
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
29
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
30
30
  </properties>
31
31
  <dependencies>
32
32
  <dependency>
@@ -26,7 +26,7 @@
26
26
  </scm>
27
27
  <properties>
28
28
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
29
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
29
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
30
30
  </properties>
31
31
  <dependencies>
32
32
  <dependency>
@@ -26,7 +26,7 @@
26
26
  </scm>
27
27
  <properties>
28
28
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
29
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
29
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
30
30
  </properties>
31
31
  <dependencies>
32
32
  <dependency>
@@ -26,7 +26,7 @@
26
26
  </scm>
27
27
  <properties>
28
28
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
29
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
29
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
30
30
  </properties>
31
31
  <dependencies>
32
32
  <dependency>
@@ -26,7 +26,7 @@
26
26
  </scm>
27
27
  <properties>
28
28
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
29
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
29
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
30
30
  </properties>
31
31
  <repositories>
32
32
  <repository>
@@ -26,7 +26,7 @@
26
26
  </scm>
27
27
  <properties>
28
28
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
29
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
29
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
30
30
  </properties>
31
31
  <repositories>
32
32
  <repository>
@@ -26,7 +26,7 @@
26
26
  </scm>
27
27
  <properties>
28
28
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
29
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
29
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
30
30
  </properties>
31
31
  <repositories>
32
32
  <repository>
@@ -24,7 +24,7 @@
24
24
  </scm>
25
25
  <properties>
26
26
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
27
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
27
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
28
28
  </properties>
29
29
  <repositories>
30
30
  <repository>
@@ -30,7 +30,7 @@
30
30
  </scm>
31
31
  <properties>
32
32
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
33
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
33
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
34
34
  </properties>
35
35
  <dependencies>
36
36
  <dependency>
@@ -30,7 +30,7 @@
30
30
  </scm>
31
31
  <properties>
32
32
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
33
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
33
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
34
34
  </properties>
35
35
  <dependencies>
36
36
  <dependency>
@@ -30,7 +30,7 @@
30
30
  </scm>
31
31
  <properties>
32
32
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
33
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
33
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
34
34
  <version_from_model>1.5.0</version_from_model>
35
35
  </properties>
36
36
  <repositories>
@@ -30,7 +30,7 @@
30
30
  </scm>
31
31
  <properties>
32
32
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
33
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
33
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
34
34
  </properties>
35
35
  <dependencies>
36
36
  <dependency>
@@ -30,7 +30,7 @@
30
30
  </scm>
31
31
  <properties>
32
32
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
33
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
33
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
34
34
  </properties>
35
35
  <dependencies>
36
36
  <dependency>
@@ -30,7 +30,7 @@
30
30
  </scm>
31
31
  <properties>
32
32
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
33
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
33
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
34
34
  <tesla.dump.pom>pom.xml</tesla.dump.pom>
35
35
  <tesla.dump.readonly>true</tesla.dump.readonly>
36
36
  </properties>
@@ -17,7 +17,7 @@
17
17
  <name>gemfile_with_groups</name>
18
18
  <properties>
19
19
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
20
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
20
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
21
21
  </properties>
22
22
  <dependencies>
23
23
  <dependency>
@@ -63,6 +63,7 @@
63
63
  </repository>
64
64
  </repositories>
65
65
  <build>
66
+ <directory>${basedir}/pkg</directory>
66
67
  <plugins>
67
68
  <plugin>
68
69
  <groupId>de.saumya.mojo</groupId>
@@ -17,7 +17,7 @@
17
17
  <name>gemfile_with_groups_and_lockfile</name>
18
18
  <properties>
19
19
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
20
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
20
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
21
21
  </properties>
22
22
  <repositories>
23
23
  <repository>
@@ -26,6 +26,7 @@
26
26
  </repository>
27
27
  </repositories>
28
28
  <build>
29
+ <directory>${basedir}/pkg</directory>
29
30
  <plugins>
30
31
  <plugin>
31
32
  <groupId>de.saumya.mojo</groupId>
File without changes
@@ -0,0 +1,2 @@
1
+ org.bouncycastle:bcpkix-jdk15on:1.50:compile:
2
+ org.bouncycastle:bcprov-jdk15on:1.50:compile:
@@ -0,0 +1,5 @@
1
+ #-*- mode: ruby -*-
2
+
3
+ gemfile
4
+
5
+ # vim: syntax=Ruby
@@ -0,0 +1,70 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <!--
3
+
4
+ Copyright (c) 2012 to original author or authors
5
+ All rights reserved. This program and the accompanying materials
6
+ are made available under the terms of the Eclipse Public License v1.0
7
+ which accompanies this distribution, and is available at
8
+ http://www.eclipse.org/legal/epl-v10.html
9
+
10
+ -->
11
+ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
12
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
+ <modelVersion>4.0.0</modelVersion>
14
+ <groupId>no_group_id_given</groupId>
15
+ <artifactId>gemfile_with_jars_lock</artifactId>
16
+ <version>0.0.0</version>
17
+ <name>gemfile_with_jars_lock</name>
18
+ <properties>
19
+ <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
20
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
21
+ </properties>
22
+ <repositories>
23
+ <repository>
24
+ <id>rubygems-releases</id>
25
+ <url>http://rubygems-proxy.torquebox.org/releases</url>
26
+ </repository>
27
+ </repositories>
28
+ <build>
29
+ <directory>${basedir}/pkg</directory>
30
+ <plugins>
31
+ <plugin>
32
+ <groupId>de.saumya.mojo</groupId>
33
+ <artifactId>gem-maven-plugin</artifactId>
34
+ <version>${jruby.plugins.version}</version>
35
+ <executions>
36
+ <execution>
37
+ <id>install gems</id>
38
+ <goals>
39
+ <goal>initialize</goal>
40
+ </goals>
41
+ </execution>
42
+ </executions>
43
+ </plugin>
44
+ </plugins>
45
+ </build>
46
+ <profiles>
47
+ <profile>
48
+ <id>Jars.lock</id>
49
+ <activation>
50
+ <file>
51
+ <exists>Jars.lock</exists>
52
+ </file>
53
+ </activation>
54
+ <dependencies>
55
+ <dependency>
56
+ <groupId>org.bouncycastle</groupId>
57
+ <artifactId>bcpkix-jdk15on</artifactId>
58
+ <version>1.50</version>
59
+ <scope>compile</scope>
60
+ </dependency>
61
+ <dependency>
62
+ <groupId>org.bouncycastle</groupId>
63
+ <artifactId>bcprov-jdk15on</artifactId>
64
+ <version>1.50</version>
65
+ <scope>compile</scope>
66
+ </dependency>
67
+ </dependencies>
68
+ </profile>
69
+ </profiles>
70
+ </project>
@@ -40,3 +40,6 @@ DEPENDENCIES
40
40
  bouncy-castle-java!
41
41
  rspec (~> 2.11)
42
42
  virtus
43
+
44
+ BUNDLED WITH
45
+ 1.10.5
@@ -30,7 +30,7 @@
30
30
  </scm>
31
31
  <properties>
32
32
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
33
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
33
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
34
34
  </properties>
35
35
  <dependencies>
36
36
  <dependency>
@@ -155,6 +155,14 @@
155
155
  </plugin>
156
156
  </plugins>
157
157
  </build>
158
+ <dependencies>
159
+ <dependency>
160
+ <groupId>rubygems</groupId>
161
+ <artifactId>bundler</artifactId>
162
+ <version>1.10.5</version>
163
+ <type>gem</type>
164
+ </dependency>
165
+ </dependencies>
158
166
  </profile>
159
167
  </profiles>
160
168
  </project>
@@ -17,7 +17,7 @@
17
17
  <name>gemfile_with_path</name>
18
18
  <properties>
19
19
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
20
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
20
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
21
21
  </properties>
22
22
  <dependencies>
23
23
  <dependency>
@@ -29,7 +29,7 @@
29
29
  <dependency>
30
30
  <groupId>rubygems</groupId>
31
31
  <artifactId>bundler</artifactId>
32
- <version>1.9.3</version>
32
+ <version>1.10.6</version>
33
33
  <type>gem</type>
34
34
  <scope>provided</scope>
35
35
  </dependency>
@@ -41,6 +41,7 @@
41
41
  </repository>
42
42
  </repositories>
43
43
  <build>
44
+ <directory>${basedir}/pkg</directory>
44
45
  <plugins>
45
46
  <plugin>
46
47
  <groupId>de.saumya.mojo</groupId>
@@ -17,7 +17,7 @@
17
17
  <name>gemfile_with_platforms</name>
18
18
  <properties>
19
19
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
20
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
20
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
21
21
  </properties>
22
22
  <dependencies>
23
23
  <dependency>
@@ -40,6 +40,7 @@
40
40
  </repository>
41
41
  </repositories>
42
42
  <build>
43
+ <directory>${basedir}/pkg</directory>
43
44
  <plugins>
44
45
  <plugin>
45
46
  <groupId>de.saumya.mojo</groupId>
@@ -30,7 +30,7 @@
30
30
  </scm>
31
31
  <properties>
32
32
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
33
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
33
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
34
34
  </properties>
35
35
  <dependencies>
36
36
  <dependency>
@@ -30,7 +30,7 @@
30
30
  </scm>
31
31
  <properties>
32
32
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
33
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
33
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
34
34
  </properties>
35
35
  <dependencies>
36
36
  <dependency>
@@ -30,7 +30,7 @@
30
30
  </scm>
31
31
  <properties>
32
32
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
33
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
33
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
34
34
  </properties>
35
35
  <dependencies>
36
36
  <dependency>
@@ -8,7 +8,7 @@
8
8
  <name>gemfile_with_test_group</name>
9
9
  <properties>
10
10
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
11
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
11
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
12
12
  </properties>
13
13
  <repositories>
14
14
  <repository>
@@ -17,6 +17,7 @@
17
17
  </repository>
18
18
  </repositories>
19
19
  <build>
20
+ <directory>${basedir}/pkg</directory>
20
21
  <plugins>
21
22
  <plugin>
22
23
  <groupId>de.saumya.mojo</groupId>
@@ -17,7 +17,7 @@
17
17
  <name>gemfile_without_gemspec</name>
18
18
  <properties>
19
19
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
20
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
20
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
21
21
  </properties>
22
22
  <dependencies>
23
23
  <dependency>
@@ -34,6 +34,7 @@
34
34
  </repository>
35
35
  </repositories>
36
36
  <build>
37
+ <directory>${basedir}/pkg</directory>
37
38
  <plugins>
38
39
  <plugin>
39
40
  <groupId>de.saumya.mojo</groupId>
@@ -47,7 +47,7 @@
47
47
  </scm>
48
48
  <properties>
49
49
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
50
- <jruby.plugins.version>1.0.9</jruby.plugins.version>
50
+ <jruby.plugins.version>1.1.1</jruby.plugins.version>
51
51
  </properties>
52
52
  <dependencies>
53
53
  <dependency>