Skip to content

Commit 906e1a2

Browse files
KostyaShaKostyaSha
authored
Jar packaging. (#1337)
* Jar packaging. bundle is duplicating everything. * fix maven warnings
1 parent 6da5ce6 commit 906e1a2

File tree

7 files changed

+27
-22
lines changed

7 files changed

+27
-22
lines changed

‎docker-java-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010

1111
<artifactId>docker-java-api</artifactId>
12-
<packaging>bundle</packaging>
12+
<packaging>jar</packaging>
1313

1414
<name>docker-java-api</name>
1515
<url>https://github.com/docker-java/docker-java</url>

‎docker-java-core/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</parent>
1010

1111
<artifactId>docker-java-core</artifactId>
12-
<packaging>bundle</packaging>
12+
<packaging>jar</packaging>
1313

1414
<name>docker-java-core</name>
1515
<url>https://github.com/docker-java/docker-java</url>
1616
<description>Java API Client for Docker</description>
1717

1818
<dependencies>
1919
<dependency>
20-
<groupId>${groupId}</groupId>
20+
<groupId>${project.groupId}</groupId>
2121
<artifactId>docker-java-api</artifactId>
22-
<version>${version}</version>
22+
<version>${project.version}</version>
2323
</dependency>
2424

2525
<dependency>

‎docker-java-transport-jersey/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</parent>
1010

1111
<artifactId>docker-java-transport-jersey</artifactId>
12-
<packaging>bundle</packaging>
12+
<packaging>jar</packaging>
1313

1414
<name>docker-java-transport-jersey</name>
1515
<url>https://github.com/docker-java/docker-java</url>
1616
<description>Java API Client for Docker</description>
1717

1818
<dependencies>
1919
<dependency>
20-
<groupId>${groupId}</groupId>
20+
<groupId>${project.groupId}</groupId>
2121
<artifactId>docker-java-core</artifactId>
22-
<version>${version}</version>
22+
<version>${project.version}</version>
2323
</dependency>
2424

2525
<dependency>

‎docker-java-transport-netty/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</parent>
1010

1111
<artifactId>docker-java-transport-netty</artifactId>
12-
<packaging>bundle</packaging>
12+
<packaging>jar</packaging>
1313

1414
<name>docker-java-transport-netty</name>
1515
<url>https://github.com/docker-java/docker-java</url>
1616
<description>Java API Client for Docker</description>
1717

1818
<dependencies>
1919
<dependency>
20-
<groupId>${groupId}</groupId>
20+
<groupId>${project.groupId}</groupId>
2121
<artifactId>docker-java-core</artifactId>
22-
<version>${version}</version>
22+
<version>${project.version}</version>
2323
</dependency>
2424

2525
<dependency>

‎docker-java-transport-okhttp/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</parent>
1010

1111
<artifactId>docker-java-transport-okhttp</artifactId>
12-
<packaging>bundle</packaging>
12+
<packaging>jar</packaging>
1313

1414
<name>docker-java-transport-okhttp</name>
1515
<url>https://github.com/docker-java/docker-java</url>
1616
<description>Java API Client for Docker</description>
1717

1818
<dependencies>
1919
<dependency>
20-
<groupId>${groupId}</groupId>
20+
<groupId>${project.groupId}</groupId>
2121
<artifactId>docker-java-core</artifactId>
22-
<version>${version}</version>
22+
<version>${project.version}</version>
2323
</dependency>
2424

2525
<dependency>

‎docker-java/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99
</parent>
1010

1111
<artifactId>docker-java</artifactId>
12-
<packaging>bundle</packaging>
12+
<packaging>jar</packaging>
1313

1414
<name>docker-java</name>
1515
<url>https://github.com/docker-java/docker-java</url>
1616
<description>Java API Client for Docker</description>
1717

1818
<dependencies>
1919
<dependency>
20-
<groupId>${groupId}</groupId>
20+
<groupId>${project.groupId}</groupId>
2121
<artifactId>docker-java-core</artifactId>
22-
<version>${version}</version>
22+
<version>${project.version}</version>
2323
</dependency>
2424
<dependency>
25-
<groupId>${groupId}</groupId>
25+
<groupId>${project.groupId}</groupId>
2626
<artifactId>docker-java-transport-jersey</artifactId>
27-
<version>${version}</version>
27+
<version>${project.version}</version>
2828
</dependency>
2929
<dependency>
30-
<groupId>${groupId}</groupId>
30+
<groupId>${project.groupId}</groupId>
3131
<artifactId>docker-java-transport-netty</artifactId>
32-
<version>${version}</version>
32+
<version>${project.version}</version>
3333
</dependency>
3434

3535
<dependency>
@@ -40,9 +40,9 @@
4040

4141
<!-- /// Test /////////////////////////// -->
4242
<dependency>
43-
<groupId>${groupId}</groupId>
43+
<groupId>${project.groupId}</groupId>
4444
<artifactId>docker-java-transport-okhttp</artifactId>
45-
<version>${version}</version>
45+
<version>${project.version}</version>
4646
<scope>test</scope>
4747
</dependency>
4848
<dependency>

‎pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@
206206
</execution>
207207
</executions>
208208
</plugin>
209+
<plugin>
210+
<groupId>org.apache.felix</groupId>
211+
<artifactId>maven-bundle-plugin</artifactId>
212+
<version>4.2.1</version>
213+
</plugin>
209214
</plugins>
210215
</pluginManagement>
211216
<plugins>

0 commit comments

Comments
 (0)