Skip to content

Commit c0260df

Browse files
author
elig
committed
separate extractors from build info
1 parent 6880f56 commit c0260df

File tree

9 files changed

+311
-277
lines changed

9 files changed

+311
-277
lines changed

‎build-info-api/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<dependency>
4949
<groupId>org.testng</groupId>
5050
<artifactId>testng</artifactId>
51-
<classifier>jdk15</classifier>
5251
</dependency>
5352
</dependencies>
5453
</project>

‎build-info-client/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<groupId>org.jfrog.buildinfo</groupId>
3535
<artifactId>build-info-api</artifactId>
3636
</dependency>
37-
37+
3838
<dependency>
3939
<groupId>commons-io</groupId>
4040
<artifactId>commons-io</artifactId>
@@ -53,7 +53,6 @@
5353
<dependency>
5454
<groupId>org.testng</groupId>
5555
<artifactId>testng</artifactId>
56-
<classifier>jdk15</classifier>
5756
</dependency>
5857
</dependencies>
5958
</project>

‎build-info-extractor-gradle/pom.xml

+43-56
Original file line numberDiff line numberDiff line change
@@ -19,109 +19,96 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
2121
<groupId>org.jfrog.buildinfo</groupId>
22-
<artifactId>build-info-parent</artifactId>
23-
<version>1.4.x-SNAPSHOT</version>
22+
<artifactId>parent</artifactId>
23+
<version>1</version>
24+
<relativePath>../build-info-parent</relativePath>
2425
</parent>
2526

2627
<artifactId>build-info-extractor-gradle</artifactId>
2728
<version>1.0-SNAPSHOT</version>
2829
<packaging>jar</packaging>
2930
<name>JFrog Build-Info Gradle Extractor</name>
3031

31-
<dependencyManagement>
32-
<dependencies>
33-
<dependency>
34-
<groupId>org.codehaus.plexus</groupId>
35-
<artifactId>plexus-component-annotations</artifactId>
36-
<version>1.5.4</version>
37-
<scope>provided</scope>
38-
</dependency>
39-
<dependency>
40-
<groupId>org.gradle</groupId>
41-
<artifactId>gradle-core</artifactId>
42-
<version>0.9-preview-3</version>
43-
</dependency>
44-
<dependency>
45-
<groupId>org.gradle</groupId>
46-
<artifactId>gradle-plugins</artifactId>
47-
<version>0.9-preview-3</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.codehaus.groovy.maven.runtime</groupId>
51-
<artifactId>gmaven-runtime-default</artifactId>
52-
<version>1.0-rc-3</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>com.google.code.findbugs</groupId>
56-
<artifactId>jsr305</artifactId>
57-
<version>1.3.9</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.slf4j</groupId>
61-
<artifactId>slf4j-api</artifactId>
62-
<version>1.5.8</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.codehaus.groovy</groupId>
66-
<artifactId>groovy-all</artifactId>
67-
<version>1.7.1</version>
68-
</dependency>
69-
</dependencies>
70-
</dependencyManagement>
32+
<scm>
33+
<url>https://subversion.jfrog.org/jfrog/build-info/trunk/build-info-extractor-ivy/</url>
34+
<connection>scm:svn:https://subversion.jfrog.org/jfrog/build-info/trunk/build-info-extractor-ivy/</connection>
35+
</scm>
36+
37+
<properties>
38+
<build-info-version>1.4.x-SNAPSHOT</build-info-version>
39+
</properties>
7140

7241
<dependencies>
7342
<dependency>
7443
<groupId>org.jfrog.buildinfo</groupId>
75-
<artifactId>build-info-extractor</artifactId>
44+
<artifactId>build-info-api</artifactId>
45+
<version>${build-info-version}</version>
7646
</dependency>
47+
7748
<dependency>
7849
<groupId>org.jfrog.buildinfo</groupId>
7950
<artifactId>build-info-client</artifactId>
51+
<version>${build-info-version}</version>
8052
</dependency>
53+
8154
<dependency>
8255
<groupId>org.jfrog.buildinfo</groupId>
83-
<artifactId>build-info-api</artifactId>
56+
<artifactId>build-info-extractor</artifactId>
57+
<version>${build-info-version}</version>
8458
</dependency>
59+
8560
<dependency>
8661
<groupId>org.codehaus.plexus</groupId>
8762
<artifactId>plexus-component-annotations</artifactId>
63+
<version>1.5.4</version>
64+
<scope>provided</scope>
8865
</dependency>
66+
8967
<dependency>
9068
<groupId>org.gradle</groupId>
9169
<artifactId>gradle-core</artifactId>
70+
<version>0.9-preview-3</version>
9271
</dependency>
72+
9373
<dependency>
9474
<groupId>org.gradle</groupId>
9575
<artifactId>gradle-plugins</artifactId>
76+
<version>0.9-preview-3</version>
9677
</dependency>
9778

9879
<dependency>
9980
<groupId>org.codehaus.groovy.maven.runtime</groupId>
100-
<artifactId>gmaven-runtime-1.6</artifactId>
101-
<version>1.0</version>
81+
<artifactId>gmaven-runtime-default</artifactId>
82+
<version>1.0-rc-3</version>
10283
</dependency>
10384

104-
<dependency>
105-
<groupId>org.testng</groupId>
106-
<artifactId>testng</artifactId>
107-
<classifier>jdk15</classifier>
108-
</dependency>
10985
<dependency>
11086
<groupId>com.google.code.findbugs</groupId>
11187
<artifactId>jsr305</artifactId>
88+
<version>1.3.9</version>
11289
</dependency>
90+
11391
<dependency>
11492
<groupId>org.slf4j</groupId>
11593
<artifactId>slf4j-api</artifactId>
94+
<version>1.5.8</version>
11695
</dependency>
117-
<dependency>
118-
<groupId>org.easymock</groupId>
119-
<artifactId>easymockclassextension</artifactId>
120-
<scope>test</scope>
121-
</dependency>
96+
12297
<dependency>
12398
<groupId>org.codehaus.groovy</groupId>
12499
<artifactId>groovy-all</artifactId>
100+
<version>1.7.1</version>
101+
</dependency>
102+
103+
<dependency>
104+
<groupId>org.codehaus.groovy.maven.runtime</groupId>
105+
<artifactId>gmaven-runtime-1.6</artifactId>
106+
<version>1.0</version>
107+
</dependency>
108+
109+
<dependency>
110+
<groupId>org.testng</groupId>
111+
<artifactId>testng</artifactId>
125112
</dependency>
126113
</dependencies>
127114
</project>

‎build-info-extractor-ivy/pom.xml

+45-56
Original file line numberDiff line numberDiff line change
@@ -19,90 +19,79 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
2121
<groupId>org.jfrog.buildinfo</groupId>
22-
<artifactId>build-info-parent</artifactId>
23-
<version>1.4.x-SNAPSHOT</version>
22+
<artifactId>parent</artifactId>
23+
<version>1</version>
24+
<relativePath>../build-info-parent</relativePath>
2425
</parent>
25-
2626
<artifactId>build-info-extractor-ivy</artifactId>
2727
<version>1.0-SNAPSHOT</version>
2828
<packaging>jar</packaging>
2929
<name>JFrog Build-Info Ivy Extractor</name>
3030

31-
<dependencyManagement>
32-
<dependencies>
33-
<dependency>
34-
<groupId>com.google.code.findbugs</groupId>
35-
<artifactId>jsr305</artifactId>
36-
<version>1.3.9</version>
37-
</dependency>
38-
<dependency>
39-
<groupId>org.slf4j</groupId>
40-
<artifactId>slf4j-api</artifactId>
41-
<version>1.5.8</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.apache.ivy</groupId>
45-
<artifactId>ivy</artifactId>
46-
<version>2.1.0</version>
47-
<scope>provided</scope>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.apache.ant</groupId>
51-
<artifactId>ant</artifactId>
52-
<version>1.8.1</version>
53-
<scope>provided</scope>
54-
</dependency>
55-
</dependencies>
56-
</dependencyManagement>
31+
<scm>
32+
<url>https://subversion.jfrog.org/jfrog/build-info/trunk/build-info-extractor-ivy/</url>
33+
<connection>scm:svn:https://subversion.jfrog.org/jfrog/build-info/trunk/build-info-extractor-ivy/</connection>
34+
</scm>
35+
36+
<properties>
37+
<build-info-version>1.4.x-SNAPSHOT</build-info-version>
38+
</properties>
5739

5840
<dependencies>
59-
<dependency>
60-
<groupId>org.apache.ivy</groupId>
61-
<artifactId>ivy</artifactId>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.apache.ant</groupId>
65-
<artifactId>ant</artifactId>
66-
</dependency>
6741
<dependency>
6842
<groupId>org.jfrog.buildinfo</groupId>
69-
<artifactId>build-info-extractor</artifactId>
43+
<artifactId>build-info-api</artifactId>
44+
<version>${build-info-version}</version>
7045
</dependency>
46+
7147
<dependency>
7248
<groupId>org.jfrog.buildinfo</groupId>
7349
<artifactId>build-info-client</artifactId>
50+
<version>${build-info-version}</version>
7451
</dependency>
52+
7553
<dependency>
7654
<groupId>org.jfrog.buildinfo</groupId>
77-
<artifactId>build-info-api</artifactId>
55+
<artifactId>build-info-extractor</artifactId>
56+
<version>${build-info-version}</version>
7857
</dependency>
58+
7959
<dependency>
80-
<groupId>org.aspectj</groupId>
81-
<artifactId>aspectjweaver</artifactId>
60+
<groupId>com.google.code.findbugs</groupId>
61+
<artifactId>jsr305</artifactId>
62+
<version>1.3.9</version>
8263
</dependency>
64+
8365
<dependency>
84-
<groupId>org.testng</groupId>
85-
<artifactId>testng</artifactId>
86-
<classifier>jdk15</classifier>
66+
<groupId>org.slf4j</groupId>
67+
<artifactId>slf4j-api</artifactId>
68+
<version>1.5.8</version>
8769
</dependency>
88-
<!--<dependency>
89-
<groupId>org.testng</groupId>
90-
<artifactId>testng</artifactId>
91-
<classifier>jdk15</classifier>
70+
71+
<dependency>
72+
<groupId>org.apache.ivy</groupId>
73+
<artifactId>ivy</artifactId>
74+
<version>2.1.0</version>
75+
<scope>provided</scope>
9276
</dependency>
77+
9378
<dependency>
94-
<groupId>com.google.code.findbugs</groupId>
95-
<artifactId>jsr305</artifactId>
79+
<groupId>org.apache.ant</groupId>
80+
<artifactId>ant</artifactId>
81+
<version>1.8.1</version>
82+
<scope>provided</scope>
9683
</dependency>
84+
9785
<dependency>
98-
<groupId>org.slf4j</groupId>
99-
<artifactId>slf4j-api</artifactId>
86+
<groupId>org.aspectj</groupId>
87+
<artifactId>aspectjweaver</artifactId>
88+
<version>1.6.9</version>
10089
</dependency>
90+
10191
<dependency>
102-
<groupId>org.easymock</groupId>
103-
<artifactId>easymockclassextension</artifactId>
104-
<scope>test</scope>
105-
</dependency>-->
92+
<groupId>org.testng</groupId>
93+
<artifactId>testng</artifactId>
94+
</dependency>
10695
</dependencies>
10796

10897
<build>

0 commit comments

Comments
 (0)