Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
Joakim Erdfelt 2020-11-09 15:56:19 -06:00
commit fc0784b538
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 2 additions and 2 deletions

View File

@ -83,7 +83,7 @@
<configuration> <configuration>
<instructions> <instructions>
<Export-Package> <Export-Package>
org.eclipse.jetty.gcloud.session.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"; org.eclipse.jetty.gcloud.session.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
</Export-Package> </Export-Package>
</instructions> </instructions>
</configuration> </configuration>

View File

@ -702,7 +702,7 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>3.5.1</version> <version>5.1.1</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<supportedProjectTypes> <supportedProjectTypes>