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

Commit 6e8ad2f

Browse files
kingsfleetkingsfleet
committed
Merge remote-tracking branch 'upstream/master' into declarative_linking_reading
Conflicts: core-common/src/main/java/org/glassfish/jersey/uri/internal/UriTemplateParser.java core-common/src/test/java/org/glassfish/jersey/uri/UriTemplateTest.java
2 parents 461db69 + 5f23719 commit 6e8ad2f

File tree

323 files changed

+3983
-1082
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

323 files changed

+3983
-1082
lines changed

‎archetypes/jersey-heroku-webapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<parent>
4646
<groupId>org.glassfish.jersey.archetypes</groupId>
4747
<artifactId>project</artifactId>
48-
<version>2.8-SNAPSHOT</version>
48+
<version>2.9-SNAPSHOT</version>
4949
</parent>
5050

5151
<artifactId>jersey-heroku-webapp</artifactId>

‎archetypes/jersey-quickstart-grizzly2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<parent>
4545
<groupId>org.glassfish.jersey.archetypes</groupId>
4646
<artifactId>project</artifactId>
47-
<version>2.8-SNAPSHOT</version>
47+
<version>2.9-SNAPSHOT</version>
4848
</parent>
4949
<artifactId>jersey-quickstart-grizzly2</artifactId>
5050
<modelVersion>4.0.0</modelVersion>

‎archetypes/jersey-quickstart-webapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<parent>
4545
<groupId>org.glassfish.jersey.archetypes</groupId>
4646
<artifactId>project</artifactId>
47-
<version>2.8-SNAPSHOT</version>
47+
<version>2.9-SNAPSHOT</version>
4848
</parent>
4949
<modelVersion>4.0.0</modelVersion>
5050
<description>

‎archetypes/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<parent>
4646
<groupId>org.glassfish.jersey</groupId>
4747
<artifactId>project</artifactId>
48-
<version>2.8-SNAPSHOT</version>
48+
<version>2.9-SNAPSHOT</version>
4949
</parent>
5050

5151
<groupId>org.glassfish.jersey.archetypes</groupId>

‎bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<groupId>org.glassfish.jersey</groupId>
5454
<artifactId>jersey-bom</artifactId>
55-
<version>2.8-SNAPSHOT</version>
55+
<version>2.9-SNAPSHOT</version>
5656
<packaging>pom</packaging>
5757
<name>jersey-bom</name>
5858

‎bundles/apidocs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<parent>
4646
<groupId>org.glassfish.jersey.bundles</groupId>
4747
<artifactId>project</artifactId>
48-
<version>2.8-SNAPSHOT</version>
48+
<version>2.9-SNAPSHOT</version>
4949
</parent>
5050

5151
<artifactId>apidocs</artifactId>

‎bundles/examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<parent>
4646
<groupId>org.glassfish.jersey.bundles</groupId>
4747
<artifactId>project</artifactId>
48-
<version>2.8-SNAPSHOT</version>
48+
<version>2.9-SNAPSHOT</version>
4949
</parent>
5050

5151
<artifactId>jersey-examples</artifactId>

‎bundles/jaxrs-ri/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<parent>
4646
<groupId>org.glassfish.jersey.bundles</groupId>
4747
<artifactId>project</artifactId>
48-
<version>2.8-SNAPSHOT</version>
48+
<version>2.9-SNAPSHOT</version>
4949
</parent>
5050

5151
<artifactId>jaxrs-ri</artifactId>
@@ -144,8 +144,8 @@
144144
<scope>provided</scope>
145145
</dependency>
146146
<dependency>
147-
<groupId>org.glassfish.hk2.external</groupId>
148-
<artifactId>asm-all-repackaged</artifactId>
147+
<groupId>org.ow2.asm</groupId>
148+
<artifactId>asm-debug-all</artifactId>
149149
<optional>true</optional>
150150
</dependency>
151151
<dependency>
@@ -291,7 +291,7 @@
291291
<configuration>
292292
<artifactSet>
293293
<includes>
294-
<include>org.glassfish.hk2.external:asm-all-repackaged:*</include>
294+
<include>org.ow2.asm:asm-debug-all:*</include>
295295
</includes>
296296
</artifactSet>
297297
<relocations>

‎bundles/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<parent>
4848
<groupId>org.glassfish.jersey</groupId>
4949
<artifactId>project</artifactId>
50-
<version>2.8-SNAPSHOT</version>
50+
<version>2.9-SNAPSHOT</version>
5151
</parent>
5252

5353
<groupId>org.glassfish.jersey.bundles</groupId>

‎bundles/repackaged/jersey-guava/build.gradle‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,30 @@ task generateProGuardConfig << {
8888
conf << ("-keep public class ${it}${ln}")
8989
conf << ("-keepclassmembers public class ${it} { *; }${ln}")
9090
}
91-
}
91+
}
92+
93+
task copyShadedJar(type: Copy) {
94+
def version = project.hasProperty('jerseyVersion') ? jerseyVersion : ''
95+
from ('target') {
96+
include 'jersey-guava-' + version + '-shaded-sources.jar'
97+
}
98+
into 'target'
99+
100+
rename {
101+
String fileName -> fileName.replace('shaded-sources', 'sources')
102+
}
103+
}
104+
105+
task deleteShadedJar(type: Delete) {
106+
def version = project.hasProperty('jerseyVersion') ? jerseyVersion : ''
107+
delete ('target/jersey-guava-' + version + '-shaded-sources.jar')
108+
}
109+
110+
task renameShadedJar(dependsOn: ['copyShadedJar', 'deleteShadedJar'])
111+
deleteShadedJar.mustRunAfter copyShadedJar
112+
113+
copyShadedJar.onlyIf {project.hasProperty('jerseyVersion')}
114+
deleteShadedJar.onlyIf {project.hasProperty('jerseyVersion')}
115+
renameShadedJar.onlyIf {project.hasProperty('jerseyVersion')}
116+
generateProGuardConfig.onlyIf {!project.hasProperty('jerseyVersion')}
117+

0 commit comments

Comments
 (0)