rtyler
/
blueocean-plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[JENKINS-51956] upgrade to plugins parent 3.15 (#1753) 

* [JENKINS-51956] upgrade to plugins parent 3.15
* upgrade to last plugin parent force using a very MORE restrictive access-modifier-checker so skip error ATM as is's a lot of work to update this
* use a property to disable/enable access-modifier-checker plugin
* [JENKINS-51956] move BlueUrlTokenizer and RESTFetchPreloader to module blueocean-pipeline-api-impl to avoid access-modifier-checker issue
* upgrade branch-api to 2.0.20

Signed-off-by: olivier lamy <olamy@apache.org>
This commit is contained in:
Olivier Lamy 2018-06-20 11:39:17 +10:00 committed by GitHub
parent c274142b55
commit 070a04be89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blueocean-commons/src/main/java/io/jenkins/blueocean/commons/BlueUrlTokenizer.java → blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/preload/BlueUrlTokenizer.java
View File

@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package io.jenkins.blueocean.commons;
package io.jenkins.blueocean.preload;
import hudson.model.Run;
import org.kohsuke.accmod.Restricted;

6
blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/preload/FavoritesStatePreloader.java
View File

@ -24,20 +24,14 @@
package io.jenkins.blueocean.preload;
import hudson.Extension;
import hudson.model.Item;
import hudson.model.User;
import io.jenkins.blueocean.commons.BlueUrlTokenizer;
import io.jenkins.blueocean.commons.RESTFetchPreloader;
import io.jenkins.blueocean.commons.stapler.Export;
import io.jenkins.blueocean.rest.Reachable;
import io.jenkins.blueocean.rest.factory.organization.OrganizationFactory;
import io.jenkins.blueocean.rest.model.BlueFavorite;
import io.jenkins.blueocean.rest.model.BlueFavoriteContainer;
import io.jenkins.blueocean.rest.model.BlueOrganization;
import io.jenkins.blueocean.rest.model.BluePipeline;
import io.jenkins.blueocean.service.embedded.rest.OrganizationImpl;
import io.jenkins.blueocean.service.embedded.rest.UserImpl;
import jenkins.model.Jenkins;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;

2
blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/preload/PipelineActivityStatePreloader.java
View File

@ -25,8 +25,6 @@ package io.jenkins.blueocean.preload;
import hudson.Extension;
import hudson.model.Item;
import io.jenkins.blueocean.commons.BlueUrlTokenizer;
import io.jenkins.blueocean.commons.RESTFetchPreloader;
import io.jenkins.blueocean.commons.stapler.Export;
import io.jenkins.blueocean.rest.factory.BluePipelineFactory;
import io.jenkins.blueocean.rest.model.BluePipeline;

3
blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/preload/PipelineBranchRunStatePreloader.java
View File

@ -27,13 +27,10 @@ import hudson.Extension;
import hudson.model.Item;
import hudson.model.Job;
import hudson.model.Run;
import io.jenkins.blueocean.commons.BlueUrlTokenizer;
import io.jenkins.blueocean.commons.RESTFetchPreloader;
import io.jenkins.blueocean.commons.stapler.Export;
import io.jenkins.blueocean.rest.factory.BluePipelineFactory;
import io.jenkins.blueocean.rest.factory.BlueRunFactory;
import io.jenkins.blueocean.rest.model.BlueRun;
import io.jenkins.blueocean.service.embedded.rest.AbstractRunImpl;
import jenkins.branch.MultiBranchProject;
import jenkins.model.Jenkins;

2
blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/preload/PipelineStatePreloader.java
View File

@ -25,8 +25,6 @@ package io.jenkins.blueocean.preload;
import hudson.Extension;
import hudson.model.Item;
import io.jenkins.blueocean.commons.BlueUrlTokenizer;
import io.jenkins.blueocean.commons.RESTFetchPreloader;
import io.jenkins.blueocean.commons.stapler.Export;
import io.jenkins.blueocean.rest.factory.BluePipelineFactory;
import io.jenkins.blueocean.rest.model.BluePipeline;

9
blueocean-commons/src/main/java/io/jenkins/blueocean/commons/RESTFetchPreloader.java → blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/preload/RESTFetchPreloader.java
View File

@ -21,9 +21,12 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package io.jenkins.blueocean.commons;
package io.jenkins.blueocean.preload;
import io.jenkins.blueocean.commons.PageStatePreloader;
import net.sf.json.JSONObject;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import javax.annotation.Nonnull;
@ -39,7 +42,9 @@ import javax.annotation.Nonnull;
*
* @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
*/
public abstract class RESTFetchPreloader extends PageStatePreloader {
@Restricted(NoExternalUse.class)
public abstract class RESTFetchPreloader extends PageStatePreloader
{
/**
* {@inheritDoc}

2
blueocean-commons/src/test/java/io/jenkins/blueocean/commons/BlueUrlTokenizerTest.java → blueocean-pipeline-api-impl/src/test/java/io/jenkins/blueocean/preload/BlueUrlTokenizerTest.java
View File

@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package io.jenkins.blueocean.commons;
package io.jenkins.blueocean.preload;
import org.junit.Assert;
import org.junit.Test;

4
blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/rest/AbstractRunImpl.java
View File

@ -27,6 +27,7 @@ import io.jenkins.blueocean.rest.model.Container;
import io.jenkins.blueocean.rest.model.Containers;
import io.jenkins.blueocean.rest.model.GenericResource;
import jenkins.util.SystemProperties;
import org.apache.commons.lang.BooleanUtils;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.kohsuke.stapler.QueryParameter;
@ -96,7 +97,8 @@ public abstract class AbstractRunImpl<T extends Run> extends BlueRun {
@Override
public String getDescription() {
return SystemProperties.getBoolean(BLUEOCEAN_FEATURE_RUN_DESCRIPTION_ENABLED, true) ? run.getDescription() : null;
String descriptionEnabled = System.getProperty( BLUEOCEAN_FEATURE_RUN_DESCRIPTION_ENABLED, "true" );
return BooleanUtils.toBoolean( descriptionEnabled ) ? run.getDescription() : null;
}
@Override

14
pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.35</version>
<version>3.15</version>
</parent>
<groupId>io.jenkins.blueocean</groupId>
@ -40,8 +40,9 @@
<jacoco.missedclass.coverage>0.00</jacoco.missedclass.coverage>
<hpi.dependencyResolution>runtime</hpi.dependencyResolution>
<jenkins-test-harness.version>2.38</jenkins-test-harness.version>
<scm-api.version>2.2.6</scm-api.version>
<scm-api.version>2.2.7</scm-api.version>
<git.version>3.8.0</git.version>
<access-modifier-checker.failOnError>true</access-modifier-checker.failOnError>
</properties>
<scm>
@ -443,7 +444,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>branch-api</artifactId>
<version>2.0.18</version>
<version>2.0.20</version>
<exclusions>
<!-- Upper dependency fix: annotation-indexer comes from core, exclude from git -->
<exclusion>
@ -854,6 +855,13 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-checker</artifactId>
<configuration>
<failOnError>${access-modifier-checker.failOnError}</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>