Skip to content

Parent pom upgrade #17

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

Closed
oleg-nenashev wants to merge 12 commits into from
Closed

Parent pom upgrade #17

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
664bd6b
Upgrade the plugin to the latest Parent POM and to 1.625.3 baseline.
oleg-nenashev Sep 16, 2016
3aa94a1
Fix incorrect Javadoc
oleg-nenashev Sep 16, 2016
68a2d1e
Restore injected tests and escape forms by default
oleg-nenashev Sep 16, 2016
1c697da
Merge commit '3d9cdb00a3d6db750c2d238aced7df319f792631' into parent-p…
oleg-nenashev Jan 12, 2018
617cc72
Remove the duplicated sections
oleg-nenashev Jan 12, 2018
54fb675
Merge branch 'master' into parent-pom-upgrade
oleg-nenashev Feb 6, 2018
fd3e587
Update to the recent version, use Apache HttpComponents Client 4.x API
oleg-nenashev Feb 6, 2018
cc3bc76
Use 2.7.4 as a target Jenkins core version
oleg-nenashev Feb 6, 2018
029ffe9
Merge branch 'master' into parent-pom-upgrade
oleg-nenashev Mar 16, 2018
7c4677c
Merge branch 'master' into parent-pom-upgrade
jakub-bochenski Aug 8, 2018
4195ffb
Update pom.xml
jakub-bochenski Aug 8, 2018
857ec50
Update pom.xml
jakub-bochenski Aug 8, 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
55 changes: 9 additions & 46 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<skipIntegrationTests>true</skipIntegrationTests>
<jenkins-test-harness.version>2.23</jenkins-test-harness.version>
<java.level>7</java.level>
<jenkins.version>2.7.4</jenkins.version>
</properties>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.15</version>
Copy link

@jakub-bochenski jakub-bochenski Feb 6, 2018

Choose a reason for hiding this comment

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

Now it's a downgrade, since pom is at 2.15

Copy link
Member Author

@oleg-nenashev oleg-nenashev Feb 6, 2018

Choose a reason for hiding this comment

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

Right, I messed up the merge

<version>3.4</version>
</parent>

<properties>
<jenkins.version>1.625.3</jenkins.version>
Copy link
Member Author

@oleg-nenashev oleg-nenashev Feb 6, 2018

Choose a reason for hiding this comment

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

Should bump back to 2.7.4

<java.level>7</java.level>
</properties>

<repositories>
<repository>
Expand All @@ -37,19 +33,6 @@
<tag>HEAD</tag>
</scm>

<distributionManagement>
<repository>
<id>maven.jenkins-ci.org</id>
<name>jenkinsci-releases</name>
<url>https://repo.jenkins-ci.org/releases</url>
</repository>
<snapshotRepository>
<id>maven.jenkins-ci.org</id>
<name>jenkinsci-snapshots</name>
<url>https://repo.jenkins-ci.org/snapshots</url>
</snapshotRepository>
</distributionManagement>

<artifactId>logstash</artifactId>
<packaging>hpi</packaging>
<version>2.0.0-SNAPSHOT</version>
Expand All @@ -59,9 +42,9 @@

<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.4</version>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>apache-httpcomponents-client-4-api</artifactId>
<version>4.5.3-2.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -174,15 +157,6 @@
</dependencies>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>

<!-- http://jira.codehaus.org/browse/MRELEASE-812 -->
<plugin>
<artifactId>maven-release-plugin</artifactId>
Expand All @@ -199,17 +173,6 @@
</dependency>
</dependencies>
</plugin>

<!-- https://issues.jenkins-ci.org/browse/JENKINS-21977 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>InjectedTest.java</exclude>
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/jenkins/plugins/logstash/LogstashBuildWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@

/**
* Build wrapper that decorates the build's logger to insert a
* {@code LogstashNote} on each output line.
*
* @author K Jonathan Harker
*/
Expand Down
19 changes: 10 additions & 9 deletions src/main/java/jenkins/plugins/logstash/LogstashConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ public List<?> getIndexerTypes()

@SuppressWarnings("deprecation")
@Initializer(after = InitMilestone.JOB_LOADED)
public void migrateData()
public static void migrateData()
Copy link

@jakub-bochenski jakub-bochenski Aug 8, 2018

Choose a reason for hiding this comment

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

actually what is the reason for making this method static?

Copy link
Member Author

@oleg-nenashev oleg-nenashev Oct 18, 2018

Choose a reason for hiding this comment

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

The initializers are always static. The code won't even compile in newer versions otherwise IIRC

{
if (!dataMigrated)
LogstashConfiguration c = LogstashConfiguration.getInstance();
if (!c.dataMigrated)
{
Descriptor descriptor = LogstashInstallation.getLogstashDescriptor();
if (descriptor.getType() != null)
Expand All @@ -96,7 +97,7 @@ public void migrateData()
redis.setPort(descriptor.getPort());
redis.setKey(descriptor.getKey());
redis.setPassword(descriptor.getPassword());
logstashIndexer = redis;
c.logstashIndexer = redis;
break;
case ELASTICSEARCH:
LOGGER.log(Level.INFO, "Migrating logstash configuration for Elastic Search");
Expand All @@ -110,7 +111,7 @@ public void migrateData()
es.setUri(uri);
es.setUsername(descriptor.getUsername());
es.setPassword(descriptor.getPassword());
logstashIndexer = es;
c.logstashIndexer = es;
}
catch (URISyntaxException e)
{
Expand All @@ -125,7 +126,7 @@ public void migrateData()
rabbitMq.setQueue(descriptor.getKey());
rabbitMq.setUsername(descriptor.getUsername());
rabbitMq.setPassword(descriptor.getPassword());
logstashIndexer = rabbitMq;
c.logstashIndexer = rabbitMq;
break;
case SYSLOG:
LOGGER.log(Level.INFO, "Migrating logstash configuration for SYSLOG");
Expand All @@ -145,16 +146,16 @@ public void migrateData()
syslog.setMessageFormat(MessageFormat.RFC_3164);
break;
}
logstashIndexer = syslog;
c.logstashIndexer = syslog;
break;
default:
LOGGER.log(Level.INFO, "unknown logstash Indexer type: " + type);
break;
}
activeIndexer = logstashIndexer;
c.activeIndexer = c.logstashIndexer;
}
dataMigrated = true;
save();
c.dataMigrated = true;
c.save();
}
}

Expand Down
1 change: 1 addition & 0 deletions src/main/resources/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<div>
Adds the possibility to push builds logs and build data to a Logstash indexer such as Redis, RabbitMQ, Elastic Search or to Syslog.
</div>
1 change: 1 addition & 0 deletions src/main/resources/jenkins/plugins/logstash/LogstashInstallation/global.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?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">
<!-- We need to keep this file in order to prevent that in the UI we get the option to configure a Logstash Installation -->
<f:section title="Logstash Plugin" name="logstash">
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/jenkins/plugins/logstash/LogstashNotifier/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?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">
<f:block>
<f:entry title="${%Max lines}" field="maxLines">
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/jenkins/plugins/logstash/persistence/SyslogDaoTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.concurrent.TimeUnit;
import net.sf.json.JSONObject;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

import static org.awaitility.Awaitility.*;
Expand All @@ -37,6 +38,7 @@ public void before() throws Exception {

// Send a real Syslog message to Logstash.
@Test
@Ignore
public void syslogSendRFC3164UDP() throws Exception {

PrintWriter writer = null;
Expand Down