Skip to content

Commit a32e980

Browse files
bsideupbsideup
authored
Add shading tests (#390)
* Add shading tests * put back docker-java * fix test * do not shade jdbc module * fix missing space
1 parent 1505fe8 commit a32e980

File tree

14 files changed

+138
-156
lines changed

14 files changed

+138
-156
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ All notable changes to this project will be documented in this file.
88
- Fixed leakage of Vibur and Tomcat JDBC test dependencies in `jdbc-test` and `mysql` modules (#382)
99
- Added timeout and retries for creation of `RemoteWebDriver` (#381, #373, #257)
1010
- Fixed double encoding of listNetwork's filter until it's fixed in docker-java (#385)
11+
- Fixed various shading issues
1112

1213
### Changed
1314
- Added support for Docker networks (#372)
1415
- Added `getFirstMappedPort` method (#377)
1516
- Extracted Oracle XE container into a separate repository ([testcontainers/testcontainers-java-module-oracle-xe](https://github.com/testcontainers/testcontainers-java-module-oracle-xe))
17+
- Added shading tests
1618

1719
## [1.3.1] - 2017-06-22
1820
### Fixed

‎core/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
<groupId>org.glassfish.jersey.connectors</groupId>
3535
<artifactId>*</artifactId>
3636
</exclusion>
37+
<exclusion>
38+
<groupId>log4j</groupId>
39+
<artifactId>log4j</artifactId>
40+
</exclusion>
3741
</exclusions>
3842
</dependency>
3943

@@ -228,9 +232,17 @@
228232
<filter>
229233
<artifact>*:*</artifact>
230234
<excludes>
235+
<exclude>META-INF/NOTICE</exclude>
236+
<exclude>META-INF/LICENSE</exclude>
237+
<exclude>META-INF/DEPENDENCIES</exclude>
238+
<exclude>META-INF/maven/</exclude>
231239
<exclude>META-INF/*.SF</exclude>
232240
<exclude>META-INF/*.DSA</exclude>
233241
<exclude>META-INF/*.RSA</exclude>
242+
<exclude>META-INF/io.netty.versions.properties</exclude>
243+
<exclude>mozilla/public-suffix-list.txt</exclude>
244+
<!-- README.md comes from docker-java -->
245+
<exclude>META-INF/services/README.md</exclude>
234246
<exclude>META-INF/services/com.fasterxml.jackson.core.*</exclude>
235247
<exclude>META-INF/services/com.github.dockerjava.api.command.*</exclude>
236248
<exclude>META-INF/services/javax.ws.rs.ext.*</exclude>

‎modules/jdbc/pom.xml‎

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -26,75 +26,4 @@
2626
</dependency>
2727
</dependencies>
2828

29-
<build>
30-
<plugins>
31-
<plugin>
32-
<artifactId>maven-shade-plugin</artifactId>
33-
<version>2.4.3</version>
34-
<executions>
35-
<execution>
36-
<phase>package</phase>
37-
<goals>
38-
<goal>shade</goal>
39-
</goals>
40-
</execution>
41-
</executions>
42-
<configuration>
43-
<transformers>
44-
<transformer
45-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
46-
<transformer
47-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
48-
</transformers>
49-
<relocations>
50-
<relocation>
51-
<pattern>com.google.common</pattern>
52-
<shadedPattern>org.testcontainers.shaded.com.google.common</shadedPattern>
53-
</relocation>
54-
<relocation>
55-
<pattern>org.glassfish</pattern>
56-
<shadedPattern>org.testcontainers.shaded.org.glassfish</shadedPattern>
57-
</relocation>
58-
<relocation>
59-
<pattern>javax.ws.rs</pattern>
60-
<shadedPattern>org.testcontainers.shaded.javax.ws.rs</shadedPattern>
61-
</relocation>
62-
<relocation>
63-
<pattern>com.fasterxml.jackson</pattern>
64-
<shadedPattern>org.testcontainers.shaded.com.fasterxml.jackson</shadedPattern>
65-
</relocation>
66-
</relocations>
67-
<filters>
68-
<filter>
69-
<artifact>org.bouncycastle:*</artifact>
70-
<excludes>
71-
<exclude>META-INF/*.SF</exclude>
72-
<exclude>META-INF/*.DSA</exclude>
73-
<exclude>META-INF/*.RSA</exclude>
74-
</excludes>
75-
</filter>
76-
<filter>
77-
<artifact>*:*</artifact>
78-
<excludes>
79-
<exclude>META-INF/services/com.fasterxml.jackson.core.*</exclude>
80-
<exclude>META-INF/services/com.github.dockerjava.api.command.*</exclude>
81-
<exclude>META-INF/services/javax.ws.rs.ext.*</exclude>
82-
<exclude>META-INF/services/org.glassfish.hk2.extension.*</exclude>
83-
<exclude>META-INF/services/org.jvnet.hk2.external.generator.*</exclude>
84-
<exclude>META-INF/services/org.glassfish.jersey.internal.spi.*</exclude>
85-
</excludes>
86-
</filter>
87-
</filters>
88-
<artifactSet>
89-
<excludes>
90-
<exclude>com.google.guava:*</exclude>
91-
<exclude>org.glassfish.*:*</exclude>
92-
</excludes>
93-
</artifactSet>
94-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
95-
<shadedArtifactAttached>false</shadedArtifactAttached>
96-
</configuration>
97-
</plugin>
98-
</plugins>
99-
</build>
10029
</project>

‎modules/mysql/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
<name>TestContainers :: JDBC :: MySQL</name>
1414

1515
<dependencies>
16-
<dependency>
17-
<groupId>${project.groupId}</groupId>
18-
<artifactId>testcontainers</artifactId>
19-
<version>${project.version}</version>
20-
</dependency>
2116
<dependency>
2217
<groupId>${project.groupId}</groupId>
2318
<artifactId>jdbc</artifactId>

‎modules/postgresql/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
<name>TestContainers :: JDBC :: PostgreSQL</name>
1414

1515
<dependencies>
16-
<dependency>
17-
<groupId>${project.groupId}</groupId>
18-
<artifactId>testcontainers</artifactId>
19-
<version>${project.version}</version>
20-
</dependency>
2116
<dependency>
2217
<groupId>${project.groupId}</groupId>
2318
<artifactId>jdbc</artifactId>

‎modules/selenium/pom.xml‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@
1919
<artifactId>testcontainers</artifactId>
2020
<version>${project.version}</version>
2121
</dependency>
22-
<dependency>
23-
<groupId>com.github.docker-java</groupId>
24-
<artifactId>docker-java</artifactId>
25-
<version>${docker-java.version}</version>
26-
<scope>provided</scope>
27-
</dependency>
28-
29-
<dependency>
30-
<groupId>com.google.guava</groupId>
31-
<artifactId>guava</artifactId>
32-
<version>18.0</version>
33-
<scope>provided</scope>
34-
</dependency>
3522

3623
<!-- WebDriver dependency as 'provided' scope -->
3724
<dependency>
@@ -57,45 +44,4 @@
5744
</dependency>
5845
</dependencies>
5946

60-
<build>
61-
<plugins>
62-
<plugin>
63-
<artifactId>maven-shade-plugin</artifactId>
64-
<version>2.4.3</version>
65-
<executions>
66-
<execution>
67-
<phase>package</phase>
68-
<goals>
69-
<goal>shade</goal>
70-
</goals>
71-
</execution>
72-
</executions>
73-
<configuration>
74-
<relocations>
75-
<relocation>
76-
<pattern>com.google.common</pattern>
77-
<shadedPattern>org.testcontainers.shaded.com.google.common</shadedPattern>
78-
</relocation>
79-
</relocations>
80-
<filters>
81-
<filter>
82-
<artifact>org.bouncycastle:*</artifact>
83-
<excludes>
84-
<exclude>META-INF/*.SF</exclude>
85-
<exclude>META-INF/*.DSA</exclude>
86-
<exclude>META-INF/*.RSA</exclude>
87-
</excludes>
88-
</filter>
89-
</filters>
90-
<artifactSet>
91-
<excludes>
92-
<exclude>com.google.guava:*</exclude>
93-
</excludes>
94-
</artifactSet>
95-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
96-
<shadedArtifactAttached>false</shadedArtifactAttached>
97-
</configuration>
98-
</plugin>
99-
</plugins>
100-
</build>
10147
</project>

‎modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Date;
2525
import java.util.concurrent.TimeUnit;
2626

27-
import static com.google.common.base.Preconditions.checkState;
2827
import static java.time.temporal.ChronoUnit.SECONDS;
2928

3029
/**
@@ -87,8 +86,11 @@ protected Integer getLivenessCheckPort() {
8786
@Override
8887
protected void configure() {
8988

90-
checkState(desiredCapabilities != null);
91-
if (! customImageNameIsSet) {
89+
if (desiredCapabilities == null) {
90+
throw new IllegalStateException();
91+
}
92+
93+
if (!customImageNameIsSet) {
9294
super.setDockerImageName(getImageForCapabilities(desiredCapabilities));
9395
}
9496

‎modules/virtuoso/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
</repositories>
2020

2121
<dependencies>
22-
<dependency>
23-
<groupId>${project.groupId}</groupId>
24-
<artifactId>testcontainers</artifactId>
25-
<version>${project.version}</version>
26-
</dependency>
2722
<dependency>
2823
<groupId>${project.groupId}</groupId>
2924
<artifactId>jdbc</artifactId>

‎shade-test/clashing-deps-jackson/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<artifactId>clashing-deps-jackson</artifactId>
1414

1515
<dependencies>
16+
<dependency>
17+
<groupId>org.testcontainers</groupId>
18+
<artifactId>testcontainers</artifactId>
19+
<version>${project.version}</version>
20+
</dependency>
1621
<dependency>
1722
<groupId>redis.clients</groupId>
1823
<artifactId>jedis</artifactId>

‎shade-test/clashing-deps-jersey/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<artifactId>clashing-deps-jersey</artifactId>
1414

1515
<dependencies>
16+
<dependency>
17+
<groupId>org.testcontainers</groupId>
18+
<artifactId>testcontainers</artifactId>
19+
<version>${project.version}</version>
20+
</dependency>
1621
<dependency>
1722
<groupId>com.sun.jersey</groupId>
1823
<artifactId>jersey-client</artifactId>

0 commit comments

Comments
 (0)