Skip to content

Commit dfa2113

Browse files
arjantijmsarjantijms
authored
Merge pull request #2154 from dmatej/jdk11build
2 parents 3fd97ab + a9a92cc commit dfa2113

File tree

11 files changed

+40
-216
lines changed

11 files changed

+40
-216
lines changed

‎extras/bundles/grizzly-httpservice-bundle/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@
8686
<plugin>
8787
<artifactId>maven-compiler-plugin</artifactId>
8888
<configuration>
89-
<source>1.8</source>
90-
<target>1.8</target>
9189
<excludes>
9290
<exclude>module-info.java</exclude>
9391
</excludes>
@@ -185,6 +183,7 @@
185183
<classifier>sources</classifier>
186184
<excludeScope>provided</excludeScope>
187185
<excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
186+
<excludes>module-info.java</excludes>
188187
<!-- fudge an actual source hierarchy so that the source
189188
plugin can actually do something useful. Otherwise,
190189
you'll end up with an empty source jar -->

‎modules/bundles/comet/pom.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,6 @@
7373
</execution>
7474
</executions>
7575
</plugin>
76-
<plugin>
77-
<artifactId>maven-compiler-plugin</artifactId>
78-
<configuration>
79-
<source>1.8</source>
80-
<target>1.8</target>
81-
</configuration>
82-
</plugin>
8376
<plugin>
8477
<groupId>org.apache.maven.plugins</groupId>
8578
<artifactId>maven-javadoc-plugin</artifactId>
@@ -149,8 +142,7 @@
149142
<!-- fudge an actual source hierarchy so that the source
150143
plugin can actually do something useful. Otherwise,
151144
you'll end up with an empty source jar -->
152-
<outputDirectory>${basedir}/src/main/java
153-
</outputDirectory>
145+
<outputDirectory>${basedir}/src/main/java</outputDirectory>
154146
<overWriteReleases>false</overWriteReleases>
155147
<overWriteSnapshots>true</overWriteSnapshots>
156148
</configuration>

‎modules/bundles/core/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,6 @@
7373
</execution>
7474
</executions>
7575
</plugin>
76-
<plugin>
77-
<artifactId>maven-compiler-plugin</artifactId>
78-
<configuration>
79-
<source>1.8</source>
80-
<target>1.8</target>
81-
</configuration>
82-
</plugin>
8376
<plugin>
8477
<groupId>org.apache.maven.plugins</groupId>
8578
<artifactId>maven-javadoc-plugin</artifactId>

‎modules/bundles/http-all/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,6 @@
8686
</execution>
8787
</executions>
8888
</plugin>
89-
<plugin>
90-
<artifactId>maven-compiler-plugin</artifactId>
91-
<configuration>
92-
<source>1.8</source>
93-
<target>1.8</target>
94-
</configuration>
95-
</plugin>
9689
<plugin>
9790
<groupId>org.apache.maven.plugins</groupId>
9891
<artifactId>maven-javadoc-plugin</artifactId>
@@ -161,11 +154,11 @@
161154
<configuration>
162155
<classifier>sources</classifier>
163156
<excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
157+
<excludes>module-info.java</excludes>
164158
<!-- fudge an actual source hierarchy so that the source
165159
plugin can actually do something useful. Otherwise,
166160
you'll end up with an empty source jar -->
167-
<outputDirectory>${basedir}/src/main/java
168-
</outputDirectory>
161+
<outputDirectory>${basedir}/src/main/java</outputDirectory>
169162
<overWriteReleases>false</overWriteReleases>
170163
<overWriteSnapshots>true</overWriteSnapshots>
171164
</configuration>

‎modules/bundles/http-servlet/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@
7878
</execution>
7979
</executions>
8080
</plugin>
81-
<plugin>
82-
<artifactId>maven-compiler-plugin</artifactId>
83-
<configuration>
84-
<source>1.8</source>
85-
<target>1.8</target>
86-
</configuration>
87-
</plugin>
8881
<plugin>
8982
<groupId>org.apache.maven.plugins</groupId>
9083
<artifactId>maven-javadoc-plugin</artifactId>
@@ -152,11 +145,11 @@
152145
<configuration>
153146
<classifier>sources</classifier>
154147
<excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
148+
<excludes>module-info.java</excludes>
155149
<!-- fudge an actual source hierarchy so that the source
156150
plugin can actually do something useful. Otherwise,
157151
you'll end up with an empty source jar -->
158-
<outputDirectory>${basedir}/src/main/java
159-
</outputDirectory>
152+
<outputDirectory>${basedir}/src/main/java</outputDirectory>
160153
<overWriteReleases>false</overWriteReleases>
161154
<overWriteSnapshots>true</overWriteSnapshots>
162155
</configuration>

‎modules/bundles/http/pom.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@
9191
</execution>
9292
</executions>
9393
</plugin>
94-
<plugin>
95-
<artifactId>maven-compiler-plugin</artifactId>
96-
<configuration>
97-
<source>1.8</source>
98-
<target>1.8</target>
99-
</configuration>
100-
</plugin>
10194
<plugin>
10295
<groupId>org.apache.maven.plugins</groupId>
10396
<artifactId>maven-javadoc-plugin</artifactId>
@@ -171,8 +164,7 @@
171164
<!-- fudge an actual source hierarchy so that the source
172165
plugin can actually do something useful. Otherwise,
173166
you'll end up with an empty source jar -->
174-
<outputDirectory>${basedir}/src/main/java
175-
</outputDirectory>
167+
<outputDirectory>${basedir}/src/main/java</outputDirectory>
176168
<overWriteReleases>false</overWriteReleases>
177169
<overWriteSnapshots>true</overWriteSnapshots>
178170
</configuration>

‎modules/bundles/websockets/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,6 @@
8383
</execution>
8484
</executions>
8585
</plugin>
86-
<plugin>
87-
<artifactId>maven-compiler-plugin</artifactId>
88-
<configuration>
89-
<source>1.8</source>
90-
<target>1.8</target>
91-
</configuration>
92-
</plugin>
9386
<plugin>
9487
<groupId>org.apache.maven.plugins</groupId>
9588
<artifactId>maven-javadoc-plugin</artifactId>
@@ -156,11 +149,11 @@
156149
<configuration>
157150
<classifier>sources</classifier>
158151
<excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
152+
<excludes>module-info.java</excludes>
159153
<!-- fudge an actual source hierarchy so that the source
160154
plugin can actually do something useful. Otherwise,
161155
you'll end up with an empty source jar -->
162-
<outputDirectory>${basedir}/src/main/java
163-
</outputDirectory>
156+
<outputDirectory>${basedir}/src/main/java</outputDirectory>
164157
<overWriteReleases>false</overWriteReleases>
165158
<overWriteSnapshots>true</overWriteSnapshots>
166159
</configuration>

‎modules/grizzly/src/main/java/org/glassfish/grizzly/AbstractTransport.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public abstract class AbstractTransport implements Transport {
4545
*/
4646
protected volatile boolean isBlocking;
4747

48+
@Deprecated
4849
protected volatile boolean isStandalone;
4950

5051
/**
@@ -110,7 +111,7 @@ public abstract class AbstractTransport implements Transport {
110111
/**
111112
* Transport probes
112113
*/
113-
protected final DefaultMonitoringConfig<TransportProbe> transportMonitoringConfig = new DefaultMonitoringConfig<TransportProbe>(TransportProbe.class) {
114+
protected final DefaultMonitoringConfig<TransportProbe> transportMonitoringConfig = new DefaultMonitoringConfig<>(TransportProbe.class) {
114115

115116
@Override
116117
public Object createManagementObject() {

‎modules/http-server/src/main/java/org/glassfish/grizzly/http/server/LegacyLocaleParser.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)