Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Java11 support - clean version #68

Merged
merged 19 commits into from
Jan 3, 2019
Merged

Java11 support - clean version #68

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3fcfc2e
[JENKINS-52001] - Update JBoss Marshalling to 2.0.5.Final in order to…
oleg-nenashev Jun 18, 2018
38984f8
[JENKINS-52001] - Bump to the core versions with new BCT
oleg-nenashev Jun 18, 2018
b10885c
Initial fixes to allow build with rough Java10 support
svanoort Jun 18, 2018
bda50b2
Merge pull request #64 from oleg-nenashev/java10/JENKINS-52001
svanoort Jun 18, 2018
bacb9d9
Disable broken unit tests to permit us to deploy an Incremental
svanoort Jun 18, 2018
9c0d5f5
[JENKINS-52001] - Skip Tests in buildPlugin()
oleg-nenashev Jun 19, 2018
5c80fa9
[JENKINS-52001] - Kickstart the build after the Pipeline Library update
oleg-nenashev Jun 19, 2018
e017dc5
Merge commit 'bda50b2b5be5324b3075af7cd01256dccea6711e' into java10/J…
oleg-nenashev Jun 19, 2018
be9a5ea
Merge pull request #66 from oleg-nenashev/java10/JENKINS-52001
svanoort Jun 19, 2018
34609aa
Consume new animalsniffer dependency and re-enable testing
svanoort Jun 22, 2018
f6d88d0
Pick up core incremental build for now
svanoort Jun 22, 2018
4420c05
Remove core dependency so we can run this on current Jenkins and re-e…
svanoort Jun 26, 2018
be6f10c
Prevent enforcer failure due to multi-release JAR for JBoss Marshalling
svanoort Jun 27, 2018
43d37d4
Merge commit '8105510ba5617c19e90c8cf5ee467fb559833d8d' into java10-s…
oleg-nenashev Sep 20, 2018
d243824
Mark compatiblesince for change in serialization
svanoort Sep 22, 2018
8880828
Tests come back?
svanoort Sep 22, 2018
96d1cab
Merge remote-tracking branch 'svanoort/java10-support-clean' into jav…
svanoort Sep 22, 2018
3c1d020
Merge branch 'java10-support' into java10-support-clean
svanoort Sep 22, 2018
473cfcd
Merge commit '27483b1e8cf046fa2aa4785c44429eee4bfad316' into java10-s…
oleg-nenashev Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.21</version>
<version>3.22</version>
<relativePath />
</parent>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down Expand Up @@ -95,9 +95,16 @@
<version>1.39</version>
</dependency>
<dependency>
<!-- Requires Java 9+ -->
<groupId>org.jboss.marshalling</groupId>
<artifactId>jboss-marshalling-river</artifactId>
<version>1.4.12.jenkins-3</version> <!-- https://github.com/jglick/jboss-marshalling/compare/1.4.12.Final...1.4.12.jenkins-3 -->
<version>2.0.5.Final</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
<version>1.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down Expand Up @@ -223,9 +230,28 @@
<artifactId>maven-hpi-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<compatibleSinceVersion>2.17</compatibleSinceVersion>
<compatibleSinceVersion>2.21</compatibleSinceVersion>
</configuration>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>display-info</id>
<configuration>
<rules>
<enforceBytecodeVersion>
<excludes combine.children="append">
<!-- Prevents enforcer complaining about multi-release JAR -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where it the upstream bug?

<exclude>org.jboss.marshalling:jboss-marshalling-river</exclude>
<exclude>org.jboss.marshalling:jboss-marshalling</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>