Skip to content

Commit

Permalink
Merge pull request #50 from jglick/metadata-JENKINS-47634
Browse files Browse the repository at this point in the history 
[JENKINS-47634] Metadata fix refinement
  • Loading branch information
@jglick
jglick committed Oct 28, 2017
2 parents f0217f1 + a830e25 commit 4089c98
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 71 deletions.
9 changes: 0 additions & 9 deletions plugins-compat-tester-cli/pom.xml
View file
Expand Up @@ -15,15 +15,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
11 changes: 0 additions & 11 deletions plugins-compat-tester-gae-client/pom.xml
View file
Expand Up @@ -28,17 +28,6 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
Expand Down
11 changes: 0 additions & 11 deletions plugins-compat-tester-gae/pom.xml
View file
Expand Up @@ -28,17 +28,6 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
Expand Down
13 changes: 1 addition & 12 deletions plugins-compat-tester-model/pom.xml
View file
Expand Up @@ -27,17 +27,6 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
Expand Down Expand Up @@ -86,4 +75,4 @@
<artifactId>jenkins-core</artifactId>
</dependency>
</dependencies>
</project>
</project>
11 changes: 0 additions & 11 deletions plugins-compat-tester/pom.xml
View file
Expand Up @@ -28,17 +28,6 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
Expand Down
36 changes: 21 additions & 15 deletions plugins-compat-tester/src/main/java/org/jenkins/tools/test/PluginCompatTester.java
View file
Expand Up @@ -25,6 +25,8 @@
*/
package org.jenkins.tools.test;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import hudson.Functions;
import hudson.maven.MavenEmbedderException;
import hudson.model.UpdateSite;
Expand Down Expand Up @@ -78,12 +80,12 @@
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.jar.JarEntry;
Expand All @@ -92,6 +94,8 @@
import java.util.jar.Manifest;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.jenkins.tools.test.maven.ExternalMavenRunner;
import org.jenkins.tools.test.maven.InternalMavenRunner;
import org.jenkins.tools.test.maven.MavenRunner;
Expand All @@ -110,8 +114,8 @@ public class PluginCompatTester {
private PluginCompatTesterConfig config;
private final MavenRunner runner;

private String[] splits;
private String[] splitCycles;
private List<String> splits;
private Set<String> splitCycles;

public PluginCompatTester(PluginCompatTesterConfig config){
this.config = config;
Expand Down Expand Up @@ -677,7 +681,7 @@ private void addSplitPluginDependencies(String thisPlugin, MavenRunner.Config mc
for (String split : splits) {
String[] pieces = split.split(" ");
String plugin = pieces[0];
if (Arrays.asList(splitCycles).contains(thisPlugin + ' ' + plugin)) {
if (splitCycles.contains(thisPlugin + ' ' + plugin)) {
System.out.println("Skipping implicit dep " + thisPlugin + " → " + plugin);
continue;
}
Expand Down Expand Up @@ -794,14 +798,12 @@ private void populateSplits(File war) throws IOException {
int found = 0;
while ((entry = jis.getNextJarEntry()) != null) {
if (entry.getName().equals("jenkins/split-plugins.txt")) {
List<String> lines = IOUtils.readLines(jis, StandardCharsets.UTF_8);
System.out.println("found splits: " + lines);
splits = lines.toArray(new String[lines.size()]);
splits = configLines(jis).collect(Collectors.toList());
System.out.println("found splits: " + splits);
found++;
} else if (entry.getName().equals("jenkins/split-plugin-cycles.txt")) {
List<String> lines = IOUtils.readLines(jis, StandardCharsets.UTF_8);
System.out.println("found split cycles: " + lines);
splitCycles = lines.toArray(new String[lines.size()]);
splitCycles = configLines(jis).collect(Collectors.toSet());
System.out.println("found split cycles: " + splitCycles);
found++;
}
}
Expand All @@ -819,7 +821,11 @@ private void populateSplits(File war) throws IOException {
}
throw new IOException("no jenkins-core-*.jar found in " + war);
}
private static final String[] HISTORICAL_SPLITS = {
// Matches syntax in ClassicPluginStrategy:
private static Stream<String> configLines(InputStream is) throws IOException {
return IOUtils.readLines(is, StandardCharsets.UTF_8).stream().filter(line -> !line.matches("#.*|\\s*"));
}
private static final List<String> HISTORICAL_SPLITS = ImmutableList.of(
"maven-plugin 1.296 1.296",
"subversion 1.310 1.0",
"cvs 1.340 0.1",
Expand All @@ -835,9 +841,9 @@ private void populateSplits(File war) throws IOException {
"matrix-project 1.561 1.0",
"junit 1.577 1.0",
"bouncycastle-api 2.16 2.16.0",
"command-launcher 2.86 1.0",
};
private static final String[] HISTORICAL_SPLIT_CYCLES = {
"command-launcher 2.86 1.0"
);
private static final Set<String> HISTORICAL_SPLIT_CYCLES = ImmutableSet.of(
"script-security matrix-auth",
"script-security windows-slaves",
"script-security antisamy-markup-formatter",
Expand All @@ -846,7 +852,7 @@ private void populateSplits(File war) throws IOException {
"script-security command-launcher",
"credentials matrix-auth",
"credentials windows-slaves"
};
);

/**
* Finds the difference of the given maps.
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Expand Up @@ -121,8 +121,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down

0 comments on commit 4089c98

Please sign in to comment.