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

Plugin facelift #6

Merged
merged 3 commits into from Oct 22, 2019
Merged

Plugin facelift #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c0cd7c
Update Parent POM to the recent version, disable enforcer
oleg-nenashev Mar 20, 2018
8b7ffdb
Fix Checkstyle warnings
oleg-nenashev Mar 20, 2018
78f7ca2
Add Jenkinsfile for ci.jenkins.io
oleg-nenashev Mar 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Jenkinsfile
View file
Open in desktop
@@ -0,0 +1,2 @@
// Build the plugin using https://github.com/jenkins-infra/pipeline-library
buildPlugin(jenkinsVersions: [null, "2.107.1"])
39 changes: 15 additions & 24 deletions pom.xml
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.5</version>
<version>3.5</version>
Copy link
Member

Choose a reason for hiding this comment

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

3.6 actually

</parent>

<!--
Expand All @@ -32,7 +32,16 @@
<description>
This plugin exposes a credential for use with the Git plugin for authenticating with Google source code hosting as a service account.
</description>
<url>http://wiki.jenkins-ci.org/display/JENKINS/Google+Source+Plugin</url>
<url>https://wiki.jenkins.io/display/JENKINS/Google+Source+Plugin</url>

<properties>
<jenkins.version>1.625.3</jenkins.version>
<java.level>7</java.level>
<!-- TODO: JodaTime conflicts with the version coming from the optional Git dependency (1.5.1 vs. 2.4)-->
Copy link
Member

Choose a reason for hiding this comment

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

So use <exclusions>.

<enforcer.skip>true</enforcer.skip>
</properties>


<licenses>
<license>
<name>The Apache V2 License</name>
Expand All @@ -58,37 +67,19 @@
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>1.96</version>
<extensions>true</extensions>
<configuration>
<disabledTestInjection>true</disabledTestInjection>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand All @@ -109,9 +100,10 @@
</executions>
</plugin>
<plugin>
<!-- TODO: switch to the Parent POM's definition once it supports excludeFilterFile -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.3</version>
<version>3.0.5</version>
<configuration>
<effort>Max</effort>
<threshold>Medium</threshold>
Expand Down Expand Up @@ -187,7 +179,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
Copy link
Member

Choose a reason for hiding this comment

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

Just delete the dep—it is inherited anyway.

<dependency>
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/google/jenkins/plugins/source/GoogleRobotUsernamePasswordModule.java
View file
Open in desktop
Expand Up @@ -23,7 +23,6 @@
import com.cloudbees.plugins.credentials.domains.DomainRequirement;
import com.cloudbees.plugins.credentials.domains.HostnameSpecification;
import com.cloudbees.plugins.credentials.domains.SchemeSpecification;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.jenkins.plugins.credentials.oauth.GoogleOAuth2ScopeRequirement;
import com.google.jenkins.plugins.credentials.oauth.GoogleRobotCredentials;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/google/jenkins/plugins/source/GoogleRobotUsernamePasswordProvider.java
View file
Open in desktop
Expand Up @@ -39,7 +39,8 @@
/**
* This class automatically wraps existing GoogleRobotCredentials instances
* into a username password credential type that is compatible with source
* control plugins like the Git Plugin. In this way, a 'source.read_write'-scoped
* control plugins like the Git Plugin.
* In this way, a 'source.read_write'-scoped
* Oauth credential can be reused for source access to that project's source
* without manually creating further credentials.
*/
Expand Down