Skip to content

Commit

Permalink
Drop 2.319.x (#1543)
Browse files Browse the repository at this point in the history
* Drop 2.319.x

* Revert "Bump script-security from 1183.v774b_0b_0a_a_451 to 1189.vb_a_b_7c8fd5fde in /bom-2.332.x (#1512)"

This reverts commit 41c4799.

* jenkinsci/mailer-plugin#201 seems to work; checking

* jenkinsci/mailer-plugin#201 released

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
  • Loading branch information
timja and jglick authored Nov 2, 2022
1 parent 5d7d6fd commit 7f165fc
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 216 deletions.
187 changes: 0 additions & 187 deletions bom-2.319.x/pom.xml

This file was deleted.

2 changes: 1 addition & 1 deletion bom-2.332.x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1189.vb_a_b_7c8fd5fde</version>
<version>1183.v774b_0b_0a_a_451</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bom-2.346.x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>mailer</artifactId>
<version>435.v79ef3972b_5c7</version>
<version>435.438.v5b_81173f5b_a_1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
27 changes: 9 additions & 18 deletions pct.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,15 @@ MAVEN_PROPERTIES+=:hpi-plugin.version=3.33
# pass it in via -mavenPropertiesFile rather than using -mavenProperties because -mavenProperties
# uses a colon as the separator and these values contain colons.
#
if [[ $LINE == '2.319.x' ]]; then
#
# com.sun.mail needs to be excluded because it is still provided by core on this line (using
# pre-Jakarta imports) and we do not want it to be upgraded to a version that uses Jakarta
# imports (which is not a realistic test scenario) just because the Jakarta Mail API plugin
# happens to be on the class path and triggers an upper bounds violation.
#
echo upperBoundsExcludes=com.sun.mail:jakarta.mail,javax.servlet:servlet-api >maven.properties
else
#
# javax.servlet:servlet-api comes from core at version 0, which is an intentional trick to
# prevent this library from being used, and we do not want it to be upgraded to a nonzero
# version (which is not a realistic test scenario) just because it happens to be on the
# class path of some plugin and triggers an upper bounds violation. JENKINS-68696 tracks the
# removal of this trick.
#
echo upperBoundsExcludes=javax.servlet:servlet-api >maven.properties
fi

#
# javax.servlet:servlet-api comes from core at version 0, which is an intentional trick to
# prevent this library from being used, and we do not want it to be upgraded to a nonzero
# version (which is not a realistic test scenario) just because it happens to be on the
# class path of some plugin and triggers an upper bounds violation. JENKINS-68696 tracks the
# removal of this trick.
#
echo upperBoundsExcludes=javax.servlet:servlet-api >maven.properties

#
# Testing plugins against a version of Jenkins that requires Java 11 exposes
Expand Down
1 change: 0 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<module>bom-2.361.x</module>
<module>bom-2.346.x</module>
<module>bom-2.332.x</module>
<module>bom-2.319.x</module>
<module>sample-plugin</module>
</modules>
<scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
Expand Down
2 changes: 1 addition & 1 deletion sample-plugin/check.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def managedPluginDeps = managedDeps.collect {stripAllButGA(it)}.grep { ga ->
def art = artifactMap[ga]
if (art == null) {
if (ga.contains('.plugins') // TODO without an Artifact, we have no reliable way of checking whether it is actually a plugin
&& !(ga == 'io.jenkins.plugins:ionicons-api' && settings.activeProfiles.any {it ==~ /^2[.](332|319)[.]x$/})) { // TODO: Remove once 2.332.x is no longer part of the BOM (or if MNG-5600 is fixed and we can exclude this dependency in the BOM for old LTS lines)
&& !(ga == 'io.jenkins.plugins:ionicons-api' && settings.activeProfiles.any {it ==~ /^2[.](332)[.]x$/})) { // TODO: Remove once 2.332.x is no longer part of the BOM (or if MNG-5600 is fixed and we can exclude this dependency in the BOM for old LTS lines)
throw new org.apache.maven.plugin.MojoFailureException("Managed plugin dependency $ga not listed in test classpath of sample plugin")
} else {
println "Do not see managed dependency $ga"
Expand Down
7 changes: 0 additions & 7 deletions sample-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -581,12 +581,5 @@
<jenkins.version>2.332.4</jenkins.version>
</properties>
</profile>
<profile>
<id>2.319.x</id>
<properties>
<bom>2.319.x</bom>
<jenkins.version>2.319.3</jenkins.version>
</properties>
</profile>
</profiles>
</project>

0 comments on commit 7f165fc

Please sign in to comment.