Skip to content

Commit

Permalink
[JENKINS-34736] Migrate to 2.9 parent pom (#4)
Browse files Browse the repository at this point in the history 
[JENKINS-34736] Migrate to 2.9 parent pom
  • Loading branch information
@armfergom @evernat
armfergom authored and evernat committed May 12, 2016
1 parent efa2123 commit 979c74a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 68 deletions.
71 changes: 5 additions & 66 deletions pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.580.1</version>
<version>2.9</version>
<relativePath />
</parent>
<groupId>org.jvnet.hudson.plugins</groupId>
Expand All @@ -17,9 +17,8 @@
<inceptionYear>2009</inceptionYear>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<findbugs-maven-plugin.version>3.0.0</findbugs-maven-plugin.version>
<maven.findbugs.failure.strict>true</maven.findbugs.failure.strict>
<jenkins.version>2.0</jenkins.version>
<java.level>7</java.level>
</properties>

<developers>
Expand All @@ -42,12 +41,6 @@
<artifactId>javamelody-core</artifactId>
<version>1.59.0</version>
</dependency>
<!-- jrobin dependency is included in javamelody-core
<dependency>
<groupId>org.jrobin</groupId>
<artifactId>jrobin</artifactId>
<version>1.5.9</version>
</dependency> -->
<!-- slf4j-api for Jenkins issue https://issues.jenkins-ci.org/browse/JENKINS-11293
NoClassDefFoundError: org.slf4j.ILoggerFactory on IBM J9 JVM,
(this may not be needed anymore since with JENKINS-12650, slf4j-api and slf4j-jdk14 are now bundled in core) -->
Expand All @@ -56,12 +49,6 @@
<artifactId>slf4j-api</artifactId>
<version>1.6.3</version>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
Expand All @@ -81,62 +68,14 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<configuration>
<disabledTestInjection>true</disabledTestInjection>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs-maven-plugin.version}</version>
<configuration>
<failOnError>${maven.findbugs.failure.strict}</failOnError>
<xmlOutput>true</xmlOutput>
</configuration>
<executions>
<execution>
<id>run-findbugs</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<scm>
<connection>scm:git:ssh://github.com/jenkinsci/monitoring-plugin.git</connection>
<developerConnection>scm:git:ssh://git@github.com/jenkinsci/monitoring-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/monitoring-plugin</url>
<tag>HEAD</tag>
</scm>

<distributionManagement>
<repository>
<id>maven.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/releases/</url>
</repository>
</distributionManagement>
<tag>HEAD</tag>
</scm>

<repositories>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jvnet/hudson/plugins/monitoring/NodeMonitoringAction.java
View file
Expand Up @@ -25,7 +25,7 @@
/**
* Implements a "Monitoring" button for slaves.
* This button will be available for everybody with ADMINISTER permission.
* @author Oleg Nenashev <o.v.nenashev@gmail.com>, Emeric Vernat
* @author Oleg Nenashev (o.v.nenashev@gmail.com), Emeric Vernat
* @since 1.49
*/
public class NodeMonitoringAction implements Action {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jvnet/hudson/plugins/monitoring/NodesMonitoringActionFactory.java
View file
Expand Up @@ -29,7 +29,7 @@

/**
* Generates a {@link NodeMonitoringAction} for the each slave computer.
* @author Oleg Nenashev <o.v.nenashev@gmail.com>, Emeric Vernat
* @author Oleg Nenashev (o.v.nenashev@gmail.com), Emeric Vernat
*/
@Extension
public class NodesMonitoringActionFactory extends TransientComputerActionFactory {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/index.jelly
View file
Expand Up @@ -3,6 +3,7 @@
Since we don't really have anything dynamic here, let's just use static HTML.
-->
<?jelly escape-by-default='true'?>
<div>
Jenkins' monitoring with <a href='https://github.com/javamelody/javamelody/wiki' target='_blank'>JavaMelody</a>.
Open <a href='${request.contextPath}/monitoring'>report</a> after installation.
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/org/jvnet/hudson/plugins/monitoring/NodeMonitoringAction/index.jelly
View file
Expand Up @@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<l:layout permission="${app.ADMINISTER}" xmlns:local="local" norefresh="true">
Expand Down

0 comments on commit 979c74a

Please sign in to comment.