Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit af9f297

Browse files
author
Michal Gajdos
committed
Some modifications for J-333: Modify hudson jobs to use JDK8,
 don't deploy test binaries/bundles to Maven Central Change-Id: If4a20001cd3f2cbbe669c273642311b57286b82c Signed-off-by: Michal Gajdos <[email protected]>
1 parent f8f7661 commit af9f297

File tree

9 files changed

+167
-88
lines changed

9 files changed

+167
-88
lines changed

‎bundles/repackaged/jersey-guava/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<configuration>
9696
<instructions>
9797
<Import-Package>
98+
!${jersey.repackaged.prefix}.com.google.common.*,
9899
javax.annotation;resolution:=optional;version="[1.2,2)",
99100
javax.inject;resolution:=optional;version="[1.0,2)",
100101
sun.misc.*;resolution:=optional,
@@ -219,6 +220,8 @@
219220
<options>
220221
<option>-dontoptimize</option>
221222
<option>-dontobfuscate</option>
223+
<option>-keepparameternames</option>
224+
<option>-keepattributes Signature,InnerClasses,*Annotation*</option>
222225
</options>
223226
<addMavenDescriptor>false</addMavenDescriptor>
224227
<proguardInclude>${project.build.directory}/proguard.conf</proguardInclude>

‎pom.xml‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,11 @@
281281
<artifactId>maven-jar-plugin</artifactId>
282282
<version>2.4</version>
283283
</plugin>
284+
<plugin>
285+
<groupId>org.apache.maven.plugins</groupId>
286+
<artifactId>maven-install-plugin</artifactId>
287+
<version>2.5.2</version>
288+
</plugin>
284289
<plugin>
285290
<groupId>org.apache.maven.plugins</groupId>
286291
<artifactId>maven-resources-plugin</artifactId>
@@ -511,6 +516,11 @@
511516
<failOnMissingWebXml>false</failOnMissingWebXml>
512517
</configuration>
513518
</plugin>
519+
<plugin>
520+
<groupId>org.apache.maven.plugins</groupId>
521+
<artifactId>maven-ear-plugin</artifactId>
522+
<version>2.8</version>
523+
</plugin>
514524
<plugin>
515525
<groupId>org.glassfish.embedded</groupId>
516526
<artifactId>maven-embedded-glassfish-plugin</artifactId>
@@ -638,12 +648,12 @@
638648
<plugin>
639649
<groupId>com.github.wvengen</groupId>
640650
<artifactId>proguard-maven-plugin</artifactId>
641-
<version>2.0.6</version>
651+
<version>2.0.8</version>
642652
<dependencies>
643653
<dependency>
644654
<groupId>net.sf.proguard</groupId>
645655
<artifactId>proguard-base</artifactId>
646-
<version>4.11</version>
656+
<version>5.1</version>
647657
<scope>runtime</scope>
648658
</dependency>
649659
</dependencies>
@@ -829,6 +839,41 @@
829839
</site>
830840
</distributionManagement>
831841
</profile>
842+
<profile>
843+
<id>jdk1.8</id>
844+
<activation>
845+
<jdk>1.8</jdk>
846+
</activation>
847+
<modules>
848+
<module>incubator/rx/rx-client-java8</module>
849+
</modules>
850+
<build>
851+
<pluginManagement>
852+
<plugins>
853+
<plugin>
854+
<groupId>org.apache.maven.plugins</groupId>
855+
<artifactId>maven-javadoc-plugin</artifactId>
856+
<inherited>true</inherited>
857+
<configuration>
858+
<additionalparam>-Xdoclint:none</additionalparam>
859+
</configuration>
860+
</plugin>
861+
</plugins>
862+
</pluginManagement>
863+
</build>
864+
<reporting>
865+
<plugins>
866+
<plugin>
867+
<groupId>org.apache.maven.plugins</groupId>
868+
<artifactId>maven-javadoc-plugin</artifactId>
869+
<inherited>true</inherited>
870+
<configuration>
871+
<additionalparam>-Xdoclint:none</additionalparam>
872+
</configuration>
873+
</plugin>
874+
</plugins>
875+
</reporting>
876+
</profile>
832877
</profiles>
833878

834879
<reporting>

‎tests/integration/ejb-jax-rs-ear1/pom.xml‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@
4040
holder.
4141
4242
-->
43-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
43+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4445
<modelVersion>4.0.0</modelVersion>
4546
<parent>
46-
<groupId>org.glassfish.jersey.tests.integration</groupId>
47-
<artifactId>project</artifactId>
48-
<version>2.14-SNAPSHOT</version>
47+
<groupId>org.glassfish.jersey.tests.integration</groupId>
48+
<artifactId>project</artifactId>
49+
<version>2.14-SNAPSHOT</version>
4950
</parent>
5051
<artifactId>ejb-jax-rs-ear1</artifactId>
5152
<packaging>ear</packaging>
@@ -58,19 +59,9 @@
5859

5960
<build>
6061
<plugins>
61-
<plugin>
62-
<groupId>org.apache.maven.plugins</groupId>
63-
<artifactId>maven-compiler-plugin</artifactId>
64-
<version>3.1</version>
65-
<configuration>
66-
<source>1.7</source>
67-
<target>1.7</target>
68-
</configuration>
69-
</plugin>
7062
<plugin>
7163
<groupId>org.apache.maven.plugins</groupId>
7264
<artifactId>maven-ear-plugin</artifactId>
73-
<version>2.8</version>
7465
<configuration>
7566
<version>6</version>
7667
<defaultLibBundleDir>APP-INF/lib</defaultLibBundleDir>
@@ -90,17 +81,17 @@
9081
</build>
9182

9283
<dependencies>
93-
<dependency>
94-
<groupId>org.glassfish.jersey.tests.integration</groupId>
95-
<artifactId>ejb-jax-rs-web1</artifactId>
96-
<type>war</type>
97-
<version>${project.version}</version>
98-
</dependency>
99-
<dependency>
100-
<groupId>org.glassfish.jersey.tests.integration</groupId>
101-
<artifactId>ejb-lib</artifactId>
102-
<type>ejb</type>
103-
<version>${project.version}</version>
104-
</dependency>
84+
<dependency>
85+
<groupId>org.glassfish.jersey.tests.integration</groupId>
86+
<artifactId>ejb-jax-rs-web1</artifactId>
87+
<type>war</type>
88+
<version>${project.version}</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.glassfish.jersey.tests.integration</groupId>
92+
<artifactId>ejb-lib</artifactId>
93+
<type>ejb</type>
94+
<version>${project.version}</version>
95+
</dependency>
10596
</dependencies>
10697
</project>

‎tests/integration/ejb-jax-rs-web1/pom.xml‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@
4040
holder.
4141
4242
-->
43-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
43+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4445
<modelVersion>4.0.0</modelVersion>
45-
<parent>
46-
<groupId>org.glassfish.jersey.tests.integration</groupId>
47-
<artifactId>project</artifactId>
48-
<version>2.14-SNAPSHOT</version>
49-
</parent>
46+
<parent>
47+
<groupId>org.glassfish.jersey.tests.integration</groupId>
48+
<artifactId>project</artifactId>
49+
<version>2.14-SNAPSHOT</version>
50+
</parent>
5051

5152
<artifactId>ejb-jax-rs-web1</artifactId>
5253
<packaging>war</packaging>
@@ -75,16 +76,16 @@
7576
<type>pom</type>
7677
<scope>test</scope>
7778
<exclusions>
78-
<exclusion>
79-
<groupId>org.hamcrest</groupId>
80-
<artifactId>hamcrest-core</artifactId>
81-
</exclusion>
79+
<exclusion>
80+
<groupId>org.hamcrest</groupId>
81+
<artifactId>hamcrest-core</artifactId>
82+
</exclusion>
8283
</exclusions>
8384
</dependency>
8485
<dependency>
85-
<groupId>org.hamcrest</groupId>
86-
<artifactId>hamcrest-library</artifactId>
87-
<scope>test</scope>
86+
<groupId>org.hamcrest</groupId>
87+
<artifactId>hamcrest-library</artifactId>
88+
<scope>test</scope>
8889
</dependency>
8990
</dependencies>
9091

@@ -94,7 +95,6 @@
9495
<plugin>
9596
<groupId>org.apache.maven.plugins</groupId>
9697
<artifactId>maven-war-plugin</artifactId>
97-
<version>2.1.1</version>
9898
<configuration>
9999
<failOnMissingWebXml>false</failOnMissingWebXml>
100100
<!--archive>
@@ -114,8 +114,16 @@
114114
</systemPropertyVariables>
115115
</configuration>
116116
</plugin>
117-
</plugins>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-install-plugin</artifactId>
120+
<configuration>
121+
<skip>false</skip>
122+
</configuration>
123+
</plugin>
124+
</plugins>
118125
</build>
126+
119127
<properties>
120128
<failOnMissingWebXml>false</failOnMissingWebXml>
121129
<skipTests>true</skipTests>

‎tests/integration/ejb-lib/pom.xml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
holder.
4141
4242
-->
43-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
43+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4445
<modelVersion>4.0.0</modelVersion>
4546

4647
<parent>
@@ -60,7 +61,7 @@
6061
<artifactId>javax.ws.rs-api</artifactId>
6162
<scope>provided</scope>
6263
</dependency>
63-
<dependency>
64+
<dependency>
6465
<groupId>javax.ejb</groupId>
6566
<artifactId>javax.ejb-api</artifactId>
6667
<scope>provided</scope>
@@ -70,6 +71,18 @@
7071
<artifactId>javax.annotation-api</artifactId>
7172
<scope>provided</scope>
7273
</dependency>
73-
</dependencies>
74+
</dependencies>
75+
76+
<build>
77+
<plugins>
78+
<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-install-plugin</artifactId>
81+
<configuration>
82+
<skip>false</skip>
83+
</configuration>
84+
</plugin>
85+
</plugins>
86+
</build>
7487

7588
</project>

‎tests/integration/j-59-cdi-war/pom.xml‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@
4040
holder.
4141
4242
-->
43-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
43+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4445
<modelVersion>4.0.0</modelVersion>
4546

4647
<parent>
47-
<groupId>org.glassfish.jersey.tests.integration</groupId>
48-
<artifactId>project</artifactId>
49-
<version>2.14-SNAPSHOT</version>
48+
<groupId>org.glassfish.jersey.tests.integration</groupId>
49+
<artifactId>project</artifactId>
50+
<version>2.14-SNAPSHOT</version>
5051
</parent>
5152

5253
<artifactId>j-59-cdi-war</artifactId>
@@ -77,16 +78,16 @@
7778
<type>pom</type>
7879
<scope>test</scope>
7980
<exclusions>
80-
<exclusion>
81-
<groupId>org.hamcrest</groupId>
82-
<artifactId>hamcrest-core</artifactId>
83-
</exclusion>
81+
<exclusion>
82+
<groupId>org.hamcrest</groupId>
83+
<artifactId>hamcrest-core</artifactId>
84+
</exclusion>
8485
</exclusions>
8586
</dependency>
8687
<dependency>
87-
<groupId>org.hamcrest</groupId>
88-
<artifactId>hamcrest-library</artifactId>
89-
<scope>test</scope>
88+
<groupId>org.hamcrest</groupId>
89+
<artifactId>hamcrest-library</artifactId>
90+
<scope>test</scope>
9091
</dependency>
9192
</dependencies>
9293

@@ -95,7 +96,6 @@
9596
<plugin>
9697
<groupId>org.apache.maven.plugins</groupId>
9798
<artifactId>maven-war-plugin</artifactId>
98-
<version>2.1.1</version>
9999
<configuration>
100100
<failOnMissingWebXml>false</failOnMissingWebXml>
101101
</configuration>
@@ -110,8 +110,16 @@
110110
</systemPropertyVariables>
111111
</configuration>
112112
</plugin>
113-
</plugins>
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-install-plugin</artifactId>
116+
<configuration>
117+
<skip>false</skip>
118+
</configuration>
119+
</plugin>
120+
</plugins>
114121
</build>
122+
115123
<properties>
116124
<failOnMissingWebXml>false</failOnMissingWebXml>
117125
<skipTests>true</skipTests>

0 commit comments

Comments
 (0)