Permalink
Browse files

Fix JENKINS-8610

  • Loading branch information...
gboissinot committed Dec 28, 2013
1 parent b04ba4e commit fa5f549fb75c38f2379318cc2d9537aa421d2a4a
30 pom.xml
@@ -1,4 +1,5 @@
<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">
<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>
<parent>
@@ -37,9 +38,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<guice.version>2.0.1</guice.version>
<dtkit.frmk.version>0.20.1</dtkit.frmk.version>
<dtkit.junit.format>0.19</dtkit.junit.format>
<dtkit.frmk.version>1.0.0</dtkit.frmk.version>
<dtkit.junit.format>0.20</dtkit.junit.format>
<dtkit.default.junit.version>0.35</dtkit.default.junit.version>
<xerces.version>2.9.1</xerces.version>
<saxon.version>9.1.0.8</saxon.version>
@@ -65,12 +65,6 @@
<dependencies>
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.lib.dtkit</groupId>
<artifactId>dtkit-metrics-model</artifactId>
@@ -245,14 +239,14 @@
</execution>
</executions>
</plugin>
<!--
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>1.100</version>
<extensions>true</extensions>
</plugin>
-->
<!--
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>1.100</version>
<extensions>true</extensions>
</plugin>
-->
</plugins>
</build>
</project>
@@ -2,9 +2,6 @@
import com.thalesgroup.dtkit.metrics.hudson.api.descriptor.TestTypeDescriptor;
import com.thalesgroup.dtkit.metrics.hudson.api.type.TestType;
import com.thalesgroup.dtkit.metrics.model.InputMetric;
import com.thalesgroup.dtkit.metrics.model.InputMetricException;
import com.thalesgroup.dtkit.metrics.model.InputMetricFactory;
import hudson.Extension;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -22,22 +19,10 @@ public CTestType(String pattern, boolean ignoreNoResultFiles, boolean failIfNotN
public static class CTestTypeDescriptor extends TestTypeDescriptor<CTestType> {
public CTestTypeDescriptor() {
super(CTestType.class, null);
super(CTestType.class, CTestInputMetric.class);
}
@Override
public String getId() {
return this.getClass().getName();
}
@Override
public InputMetric getInputMetric() {
try {
return InputMetricFactory.getInstance(CTestInputMetric.class);
} catch (InputMetricException e) {
throw new RuntimeException("Can't create the inputMetric object for the class " + CTestInputMetric.class);
}
}
}
}
@@ -2,9 +2,6 @@
import com.thalesgroup.dtkit.metrics.hudson.api.descriptor.TestTypeDescriptor;
import com.thalesgroup.dtkit.metrics.hudson.api.type.TestType;
import com.thalesgroup.dtkit.metrics.model.InputMetric;
import com.thalesgroup.dtkit.metrics.model.InputMetricException;
import com.thalesgroup.dtkit.metrics.model.InputMetricFactory;
import hudson.Extension;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -22,21 +19,9 @@ public CheckType(String pattern, boolean ignoreNoResultFiles, boolean failIfNotN
public static class CheckTypeDescriptor extends TestTypeDescriptor<CheckType> {
public CheckTypeDescriptor() {
super(CheckType.class, null);
super(CheckType.class, CheckInputMetric.class);
}
@Override
public String getId() {
return this.getClass().getName();
}
@Override
public InputMetric getInputMetric() {
try {
return InputMetricFactory.getInstance(CheckInputMetric.class);
} catch (InputMetricException e) {
throw new RuntimeException("Can't create the inputMetric object for the class " + CheckInputMetric.class);
}
}
}
}
@@ -2,9 +2,6 @@
import com.thalesgroup.dtkit.metrics.hudson.api.descriptor.TestTypeDescriptor;
import com.thalesgroup.dtkit.metrics.hudson.api.type.TestType;
import com.thalesgroup.dtkit.metrics.model.InputMetric;
import com.thalesgroup.dtkit.metrics.model.InputMetricException;
import com.thalesgroup.dtkit.metrics.model.InputMetricFactory;
import hudson.Extension;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -31,25 +28,12 @@ public String getCustomXSL() {
public static class CustomInputMetricDescriptor extends TestTypeDescriptor<CustomType> {
public CustomInputMetricDescriptor() {
super(CustomType.class, null);
}
@Override
public String getId() {
return this.getClass().getName();
}
@Override
public InputMetric getInputMetric() {
try {
return InputMetricFactory.getInstance(CustomInputMetric.class);
} catch (InputMetricException e) {
throw new RuntimeException("Can't create the inputMetric object for the class " + CustomInputMetric.class);
}
super(CustomType.class, CustomInputMetric.class);
}
public boolean isCustomType() {
return true;
}
}
}
@@ -2,9 +2,6 @@
import com.thalesgroup.dtkit.metrics.hudson.api.descriptor.TestTypeDescriptor;
import com.thalesgroup.dtkit.metrics.hudson.api.type.TestType;
import com.thalesgroup.dtkit.metrics.model.InputMetric;
import com.thalesgroup.dtkit.metrics.model.InputMetricException;
import com.thalesgroup.dtkit.metrics.model.InputMetricFactory;
import hudson.Extension;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -22,21 +19,9 @@ public GoogleTestType(String pattern, boolean ignoreNoResultFiles, boolean failI
public static class GoogleTestTypeDescriptor extends TestTypeDescriptor<GoogleTestType> {
public GoogleTestTypeDescriptor() {
super(GoogleTestType.class, null);
super(GoogleTestType.class, GoogleTestInputMetric.class);
}
@Override
public String getId() {
return this.getClass().getName();
}
@Override
public InputMetric getInputMetric() {
try {
return InputMetricFactory.getInstance(GoogleTestInputMetric.class);
} catch (InputMetricException e) {
throw new RuntimeException("Can't create the inputMetric object for the class " + GoogleTestInputMetric.class);
}
}
}
}
@@ -2,9 +2,6 @@
import com.thalesgroup.dtkit.metrics.hudson.api.descriptor.TestTypeDescriptor;
import com.thalesgroup.dtkit.metrics.hudson.api.type.TestType;
import com.thalesgroup.dtkit.metrics.model.InputMetric;
import com.thalesgroup.dtkit.metrics.model.InputMetricException;
import com.thalesgroup.dtkit.metrics.model.InputMetricFactory;
import hudson.Extension;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -22,21 +19,9 @@ public JUnitType(String pattern, boolean ignoreNoResultFiles, boolean failIfNotN
public static class JUnitTypeDescriptor extends TestTypeDescriptor<JUnitType> {
public JUnitTypeDescriptor() {
super(JUnitType.class, null);
super(JUnitType.class, JUnitInputMetric.class);
}
@Override
public String getId() {
return this.getClass().getName();
}
@Override
public InputMetric getInputMetric() {
try {
return InputMetricFactory.getInstance(JUnitInputMetric.class);
} catch (InputMetricException e) {
throw new RuntimeException("Can't create the inputMetric object for the class " + JUnitInputMetric.class);
}
}
}
}
@@ -2,9 +2,6 @@
import com.thalesgroup.dtkit.metrics.hudson.api.descriptor.TestTypeDescriptor;
import com.thalesgroup.dtkit.metrics.hudson.api.type.TestType;
import com.thalesgroup.dtkit.metrics.model.InputMetric;
import com.thalesgroup.dtkit.metrics.model.InputMetricException;
import com.thalesgroup.dtkit.metrics.model.InputMetricFactory;
import hudson.Extension;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -22,22 +19,9 @@ public MbUnitType(String pattern, boolean ignoreNoResultFiles, boolean failIfNot
public static class MbUnitTypeDescriptor extends TestTypeDescriptor<MbUnitType> {
public MbUnitTypeDescriptor() {
super(MbUnitType.class, null);
super(MbUnitType.class, MbUnitInputMetric.class);
}
@Override
public String getId() {
return this.getClass().getName();
}
@Override
public InputMetric getInputMetric() {
try {
return InputMetricFactory.getInstance(MbUnitInputMetric.class);
} catch (InputMetricException e) {
throw new RuntimeException("Can't create the inputMetric object for the class " + MbUnitInputMetric.class);
}
}
}
}
@@ -2,9 +2,6 @@
import com.thalesgroup.dtkit.metrics.hudson.api.descriptor.TestTypeDescriptor;
import com.thalesgroup.dtkit.metrics.hudson.api.type.TestType;
import com.thalesgroup.dtkit.metrics.model.InputMetric;
import com.thalesgroup.dtkit.metrics.model.InputMetricException;
import com.thalesgroup.dtkit.metrics.model.InputMetricFactory;
import hudson.Extension;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -22,22 +19,10 @@ public QTestLibType(String pattern, boolean ignoreNoResultFiles, boolean failIfN
public static class QTestLibTypeDescriptor extends TestTypeDescriptor<QTestLibType> {
public QTestLibTypeDescriptor() {
super(QTestLibType.class, null);
super(QTestLibType.class, QTestLibInputMetric.class);
}
@Override
public String getId() {
return this.getClass().getName();
}
@Override
public InputMetric getInputMetric() {
try {
return InputMetricFactory.getInstance(QTestLibInputMetric.class);
} catch (InputMetricException e) {
throw new RuntimeException("Can't create the inputMetric object for the class " + QTestLibInputMetric.class);
}
}
}
}
@@ -1,7 +1,6 @@
package org.jenkinsci.plugins.xunit.types.model;
import com.thalesgroup.dtkit.metrics.model.AbstractOutputMetric;
import com.thalesgroup.dtkit.util.validator.ValidationService;
import java.io.Serializable;
@@ -10,10 +9,6 @@
*/
public class JUnit8 extends AbstractOutputMetric implements Serializable {
public JUnit8() {
set(new ValidationService());
}
@Override
public String getKey() {
return "junit";
@@ -1,7 +1,6 @@
package org.jenkinsci.plugins.xunit.types.model;
import com.thalesgroup.dtkit.metrics.model.AbstractOutputMetric;
import com.thalesgroup.dtkit.util.validator.ValidationService;
import java.io.Serializable;
@@ -10,10 +9,6 @@
*/
public class JUnit9 extends AbstractOutputMetric implements Serializable {
public JUnit9() {
set(new ValidationService());
}
@Override
public String getKey() {
return "junit";
Oops, something went wrong.

0 comments on commit fa5f549

Please sign in to comment.