diff --git a/core/pom.xml b/core/pom.xml
index 5b8220985f22b5c6fa2782da76813abfaea4fb77..c5c0aff0266b9b09a3d14d6a5299e9a4d0e72af0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -47,29 +47,6 @@
org.apache.maven.plugins
maven-antrun-plugin
-
- create14jar
- package
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- run
-
-
generate-resources
@@ -83,9 +60,6 @@
version=${build.version}
-
- version=${build.version}
-
@@ -94,31 +68,6 @@
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- attach-artifacts
- package
-
- attach-artifact
-
-
-
-
- target/${artifactId}-${version}-jdk14.jar
- jar
- jdk14
-
-
-
-
-
-
maven-jar-plugin
@@ -141,46 +90,9 @@
true
-
-
- org.jvnet.hudson.main
- remoting
- ${version}
-
-
release
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- ../remoting/src/main/java
-
-
-
-
-
- add-source
-
-
-
-
-
-
${version}
@@ -189,6 +101,11 @@
+
+ org.jvnet.hudson.main
+ remoting
+ ${version}
+
org.apache.maven
maven-embedder
@@ -204,21 +121,6 @@
maven-agent
${version}
-
- net.sf.retrotranslator
- retrotranslator-runtime
- 1.2.1
-
-
-
- net.sf.retrotranslator
- retrotranslator-transformer
- 1.2.1
- test
-
org.kohsuke.stapler
stapler
diff --git a/core/src/main/java/hudson/util/RetrotranslatorEnumConverter.java b/core/src/main/java/hudson/util/RetrotranslatorEnumConverter.java
deleted file mode 100644
index a0cfd47cba5977a6ca579c6ac111719897f5f770..0000000000000000000000000000000000000000
--- a/core/src/main/java/hudson/util/RetrotranslatorEnumConverter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package hudson.util;
-
-import com.thoughtworks.xstream.converters.Converter;
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import net.sf.retrotranslator.runtime.java.lang.Enum_;
-
-/**
- * Converts retrotranslator's enum class to make it match with JDK5's native data format.
- *
- *
- * @author Kohsuke Kawaguchi
- */
-public class RetrotranslatorEnumConverter implements Converter {
-
- public boolean canConvert(Class type) {
- return Enum_.class.isAssignableFrom(type);
- }
-
- public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
- writer.setValue(((Enum_)source).name());
- }
-
- public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
- Class type = context.getRequiredType();
- if (type.getSuperclass() != Enum_.class) {
- type = type.getSuperclass(); // polymorphic enums
- }
- String value = reader.getValue();
- if(value==null || value.trim().length()==0) {
- /*
- backward compatibility mode. read retroweaver's format from:
-
-
- Leave this machine for tied jobs only
- 1
- EXCLUSIVE
-
- */
-
- while(reader.hasMoreChildren()) {
- reader.moveDown();
- if(reader.getNodeName().equals("name"))
- value = reader.getValue();
- reader.moveUp();
- }
- }
-
- return Enum_.valueOf(type, value);
- }
-}
diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java
index c476850b2846621e3e197e7d26cd3da42e5bd169..e58369ecca409f0956622dc052535ae7443d566b 100644
--- a/core/src/main/java/hudson/util/XStream2.java
+++ b/core/src/main/java/hudson/util/XStream2.java
@@ -39,7 +39,7 @@ public class XStream2 extends XStream {
private void init() {
registerConverter(new RobustCollectionConverter(getClassMapper()),10);
registerConverter(new RetroweaverEnumConverter(),10);
- registerConverter(new RetrotranslatorEnumConverter(),10);
+ //registerConverter(new RetrotranslatorEnumConverter(),10);
registerConverter(new CopyOnWriteList.ConverterImpl(getClassMapper()),10);
registerConverter(new DescribableList.ConverterImpl(getClassMapper()),10);
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 5049febaf096e779b159cd81c4d358c3b535e7c0..c9251b6352257383ff05f4ba3f53881b92ac8c67 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -25,105 +25,6 @@
true
-
-
- maven-assembly-plugin
-
-
- uberjar
- package
-
-
- single
-
-
- remoting-${version}
-
- assembly-uberjar-14.xml
-
-
-
- hudson.remoting.Launcher
-
-
-
-
-
-
-
-
- maven-antrun-plugin
-
-
- create14jar
- process-classes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- run
-
-
-
-
- signUberjar
- verify
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- attach-artifacts
- package
-
- attach-artifact
-
-
-
-
- target/${artifactId}-${version}-jdk14.jar
- jar
- jdk14
-
-
-
-
-
-
maven-jar-plugin
2.1
@@ -157,21 +58,6 @@
-
- net.sf.retrotranslator
- retrotranslator-runtime
- 1.2.1
-
-
-
- net.sf.retrotranslator
- retrotranslator-transformer
- 1.2.1
- test
-
junit
diff --git a/war/pom.xml b/war/pom.xml
index c5035986ac20c6c8427a98d10b35c03f5737fb76..21b75ec8d0948b361601f8d895e471175ffebfe5 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -87,7 +87,6 @@
org.jvnet.hudson.main
remoting
${version}
- ${hudsonRemotingClassifier}
slave.jar
@@ -109,7 +108,6 @@
org.jvnet.hudson.main
remoting
${version}
- ${hudsonRemotingClassifier}
remoting.jar
@@ -199,26 +197,6 @@
-
-
-
- debug
-
- true
-
-
-
-
-
-
-
- release
-
- jdk14
- jdk14-jar-with-dependencies
-
-
-
@@ -235,7 +213,6 @@
org.jvnet.hudson.main
hudson-core
${version}
- ${hudsonClassifier}