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

Commit f0119d9

Browse files
kingsfleetkingsfleet
committed
Merge remote-tracking branch 'upstream/master' into declarative_linking_reading
2 parents a19243a + 2a02bed commit f0119d9

File tree

627 files changed

+18999
-5862
lines changed

Some content is hidden

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

627 files changed

+18999
-5862
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.7-SNAPSHOT</version>
48+
<version>2.8-SNAPSHOT</version>
4949
</parent>
5050

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

‎archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<version>2.5.1</version>
6363
<inherited>true</inherited>
6464
<configuration>
65-
<source>1.6</source>
66-
<target>1.6</target>
65+
<source>1.7</source>
66+
<target>1.7</target>
6767
</configuration>
6868
</plugin>
6969
<plugin>

‎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.7-SNAPSHOT</version>
47+
<version>2.8-SNAPSHOT</version>
4848
</parent>
4949
<artifactId>jersey-quickstart-grizzly2</artifactId>
5050
<modelVersion>4.0.0</modelVersion>

‎archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<version>2.5.1</version>
4949
<inherited>true</inherited>
5050
<configuration>
51-
<source>1.6</source>
52-
<target>1.6</target>
51+
<source>1.7</source>
52+
<target>1.7</target>
5353
</configuration>
5454
</plugin>
5555
<plugin>

‎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.7-SNAPSHOT</version>
47+
<version>2.8-SNAPSHOT</version>
4848
</parent>
4949
<modelVersion>4.0.0</modelVersion>
5050
<description>

‎archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<version>2.5.1</version>
1919
<inherited>true</inherited>
2020
<configuration>
21-
<source>1.6</source>
22-
<target>1.6</target>
21+
<source>1.7</source>
22+
<target>1.7</target>
2323
</configuration>
2424
</plugin>
2525
</plugins>

‎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.7-SNAPSHOT</version>
48+
<version>2.8-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.7-SNAPSHOT</version>
55+
<version>2.8-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.7-SNAPSHOT</version>
48+
<version>2.8-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.7-SNAPSHOT</version>
48+
<version>2.8-SNAPSHOT</version>
4949
</parent>
5050

5151
<artifactId>jersey-examples</artifactId>

0 commit comments

Comments
 (0)