Skip to content

Commit a1000c8

Browse files
mkristianmkristian
committed
the test/pom.xml just does the bootstrap job. all deploy artifacts which needs the gems from bootstrap also call test/pom.xml
Conflicts: test/pom.xml
1 parent d48b76b commit a1000c8

2 files changed

Lines changed: 62 additions & 62 deletions

File tree

‎pom.xml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<modules>
3333
<module>ext</module>
3434
<module>core</module>
35-
<module>test</module>
3635
</modules>
3736

3837
<description>
@@ -384,6 +383,12 @@
384383
</dependencyManagement>
385384

386385
<profiles>
386+
<profile>
387+
<id>bootstrap</id>
388+
<modules>
389+
<module>test</module>
390+
</modules>
391+
</profile>
387392
<profile>
388393
<id>gems</id>
389394
<modules>
@@ -399,6 +404,7 @@
399404
<profile>
400405
<id>main</id>
401406
<modules>
407+
<module>test</module>
402408
<module>maven</module>
403409
</modules>
404410
<build>
@@ -408,12 +414,14 @@
408414
<profile>
409415
<id>jruby-jars</id>
410416
<modules>
417+
<module>test</module>
411418
<module>maven</module>
412419
</modules>
413420
</profile>
414421
<profile>
415422
<id>complete</id>
416423
<modules>
424+
<module>test</module>
417425
<module>maven</module>
418426
</modules>
419427
<build>
@@ -432,12 +440,14 @@
432440
<profile>
433441
<id>dist</id>
434442
<modules>
443+
<module>test</module>
435444
<module>maven</module>
436445
</modules>
437446
</profile>
438447
<profile>
439448
<id>all</id>
440449
<modules>
450+
<module>test</module>
441451
<module>docs</module>
442452
<module>maven</module>
443453
</modules>
@@ -448,20 +458,9 @@
448458
<profile>
449459
<id>release</id>
450460
<modules>
461+
<module>test</module>
451462
<module>maven</module>
452463
</modules>
453-
<build>
454-
<plugins>
455-
<plugin>
456-
<artifactId>maven-release-plugin</artifactId>
457-
<configuration>
458-
<autoVersionSubmodules>true</autoVersionSubmodules>
459-
<goals>deploy</goals>
460-
<tagNameFormat>@{project.version}</tagNameFormat>
461-
</configuration>
462-
</plugin>
463-
</plugins>
464-
</build>
465464
</profile>
466465
<profile>
467466
<id>repo</id>

‎test/pom.xml‎

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,56 @@
7474
<type>jar</type>
7575
<scope>test</scope>
7676
</dependency>
77+
<dependency>
78+
<groupId>org.jruby</groupId>
79+
<artifactId>requireTest</artifactId>
80+
<version>1.0</version>
81+
<type>jar</type>
82+
<scope>system</scope>
83+
<systemPath>${project.basedir}/requireTest-1.0.jar</systemPath>
84+
</dependency>
85+
<dependency>
86+
<groupId>rubygems</groupId>
87+
<artifactId>jruby-launcher</artifactId>
88+
<version>${jruby-launcher.version}</version>
89+
<type>gem</type>
90+
</dependency>
91+
<dependency>
92+
<groupId>rubygems</groupId>
93+
<artifactId>rake</artifactId>
94+
<version>${rake.version}</version>
95+
<type>gem</type>
96+
</dependency>
97+
<dependency>
98+
<groupId>rubygems</groupId>
99+
<artifactId>rspec</artifactId>
100+
<version>${rspec.version}</version>
101+
<type>gem</type>
102+
</dependency>
103+
<dependency>
104+
<groupId>rubygems</groupId>
105+
<artifactId>minitest</artifactId>
106+
<version>${minitest.version}</version>
107+
<type>gem</type>
108+
</dependency>
109+
<dependency>
110+
<groupId>rubygems</groupId>
111+
<artifactId>minitest-excludes</artifactId>
112+
<version>${minitest-excludes.version}</version>
113+
<type>gem</type>
114+
</dependency>
115+
<dependency>
116+
<groupId>rubygems</groupId>
117+
<artifactId>json</artifactId>
118+
<version>${json.version}</version>
119+
<type>gem</type>
120+
</dependency>
121+
<dependency>
122+
<groupId>rubygems</groupId>
123+
<artifactId>rdoc</artifactId>
124+
<version>${rdoc.version}</version>
125+
<type>gem</type>
126+
</dependency>
77127
</dependencies>
78128
<properties>
79129
<jruby.basedir>${basedir}/..</jruby.basedir>
@@ -206,53 +256,4 @@
206256
</plugins>
207257
</pluginManagement>
208258
</build>
209-
<profiles>
210-
<profile>
211-
<id>bootstrap</id>
212-
<dependencies>
213-
<dependency>
214-
<groupId>rubygems</groupId>
215-
<artifactId>jruby-launcher</artifactId>
216-
<version>${jruby-launcher.version}</version>
217-
<type>gem</type>
218-
</dependency>
219-
<dependency>
220-
<groupId>rubygems</groupId>
221-
<artifactId>rake</artifactId>
222-
<version>${rake.version}</version>
223-
<type>gem</type>
224-
</dependency>
225-
<dependency>
226-
<groupId>rubygems</groupId>
227-
<artifactId>rspec</artifactId>
228-
<version>${rspec.version}</version>
229-
<type>gem</type>
230-
</dependency>
231-
<dependency>
232-
<groupId>rubygems</groupId>
233-
<artifactId>minitest</artifactId>
234-
<version>${minitest.version}</version>
235-
<type>gem</type>
236-
</dependency>
237-
<dependency>
238-
<groupId>rubygems</groupId>
239-
<artifactId>minitest-excludes</artifactId>
240-
<version>${minitest-excludes.version}</version>
241-
<type>gem</type>
242-
</dependency>
243-
<dependency>
244-
<groupId>rubygems</groupId>
245-
<artifactId>json</artifactId>
246-
<version>${json.version}</version>
247-
<type>gem</type>
248-
</dependency>
249-
<dependency>
250-
<groupId>rubygems</groupId>
251-
<artifactId>rdoc</artifactId>
252-
<version>${rdoc.version}</version>
253-
<type>gem</type>
254-
</dependency>
255-
</dependencies>
256-
</profile>
257-
</profiles>
258259
</project>

0 commit comments

Comments
 (0)