Merge 9993547df9 into 700be6f6f9

build.xml

@@ -1,338 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- =================================================================== -->
-<!-- JBoss build file                                                    -->
-<!-- =================================================================== -->
-
-<project name="javassist" default="jar" basedir=".">
-
-  <property name="dist-version" value="javassist-3.29.2-GA"/>
-
-  <property environment="env"/>
-  <property name="target.jar" value="javassist.jar"/>
-  <property name="target-src.jar" value="javassist-src.jar"/>
-  <property name="lib.dir" value="${basedir}/lib"/>
-  <property name="src.dir" value="${basedir}/src/main"/>
-  <property name="build.dir" value="${basedir}/target"/>
-  <property name="build.classes.dir" value="${build.dir}/classes"/>
-  <property name="test.src.dir" value="${basedir}/src/test"/>
-  <property name="test.lib.dir" value="${test.src.dir}/resources"/>
-  <property name="test.build.dir" value="${build.dir}/test-classes"/>
-  <property name="test.run.dir" value="${build.dir}/runtest"/>
-  <property name="test.reports.dir" value = "${build.dir}/test-output"/>
-
-  <property name="run.dir" value="${build.classes.dir}"/>
-
-  <!-- Build classpath -->
-  <path id="classpath">
-    <pathelement location="${build.classes.dir}"/>
-  </path>
-
-  <property name="build.classpath" refid="classpath"/>
-
-  <path id="test.compile.classpath">
-    <pathelement location="${build.classes.dir}"/>
-    <pathelement location="${lib.dir}/junit.jar"/>
-    <pathelement location="${lib.dir}/hamcrest.jar"/>
-  </path>
-
-  <property name="test.compile.classpath" refid="test.compile.classpath"/>
-
-  <path id="test.classpath">
-    <pathelement location="${test.build.dir}"/>
-    <pathelement location="${test.lib.dir}"/>
-    <pathelement location="${lib.dir}/junit.jar"/>
-    <pathelement location="${lib.dir}/hamcrest.jar"/>
-    <pathelement location="${build.classes.dir}"/>
-  </path>
-
-  <property name="test.classpath" refid="test.classpath"/>
-
-  <!-- =================================================================== -->
-  <!-- Prepares the build directory                                        -->
-  <!-- =================================================================== -->
-  <target name="prepare" >
-    <mkdir dir="${build.dir}"/>
-    <mkdir dir="${build.classes.dir}"/>
-    <mkdir dir="${test.build.dir}"/>
-  	<mkdir dir="${test.reports.dir}"/>
-  	<mkdir dir="${test.run.dir}"/>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Compiles the source code                                            -->
-  <!-- =================================================================== -->
-  <target name="compile" depends="prepare">
-    <javac srcdir="${src.dir}"
-           destdir="${build.classes.dir}"
-           debug="on"
-           deprecation="on"
-           optimize="off"
-    	   includeantruntime="true"
-           includes="**">
-            <classpath refid="classpath"/>
-    </javac>
-  </target>
-
-  <target name="compile18" depends="prepare">
-    <javac srcdir="${src.dir}"
-           destdir="${build.classes.dir}"
-           debug="on"
-           deprecation="on"
-	       source="1.8"
-	       target="1.8"
-           optimize="off"
-    	   includeantruntime="true"
-           includes="**">
-      <classpath refid="classpath"/>
-    </javac>
-  </target>
-
-  <target name="test-compile" depends="compile">
-    <javac srcdir="${test.src.dir}"
-           destdir="${test.build.dir}"
-           debug="on"
-           deprecation="on"
-           optimize="off"
-    	   includeantruntime="false"
-           includes="**">
-            <classpath refid="test.compile.classpath"/>
-            <compilerarg value="-parameters" />        
-    </javac>
-  </target>
-
-  <target name="runtest" depends="jar,test-compile">
-    <copy file="${test.lib.dir}/empty.jar"
-          tofile="${test.lib.dir}/emptyorig.jar"
-          preservelastmodified="true" />
-    <junit fork="true" printsummary="true" dir="${test.run.dir}">
-      <classpath refid="test.classpath"/>
-      <formatter type="xml" extension=".xml"/>
-      <test name="javassist.JvstTest" outfile="TestLog" />
-    </junit>
-    <move file="${test.lib.dir}/emptyorig.jar"
-          tofile="${test.lib.dir}/empty.jar" />
-  </target>
-
-  <target name="runtest8" depends="jar,test-compile">
-    <copy file="${test.lib.dir}/empty.jar"
-          tofile="${test.lib.dir}/emptyorig.jar"
-          preservelastmodified="true" />
-    <junit fork="true" printsummary="true" dir="${test.run.dir}">
-      <jvmarg value="-XX:-FailOverToOldVerifier"/>
-      <classpath refid="test.classpath"/>
-      <formatter type="xml" extension=".xml"/>
-      <test name="javassist.JvstTest" outfile="TestLog" />
-    </junit>
-    <move file="${test.lib.dir}/emptyorig.jar"
-          tofile="${test.lib.dir}/empty.jar" />
-  </target>
-
-  <target name="runtest9" depends="jar,test-compile">
-    <copy file="${test.lib.dir}/empty.jar"
-          tofile="${test.lib.dir}/emptyorig.jar"
-          preservelastmodified="true" />
-    <junit fork="true" printsummary="true" dir="${test.run.dir}">
-      <jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" />
-      <jvmarg value="-XX:-FailOverToOldVerifier"/>
-      <classpath refid="test.classpath"/>
-      <formatter type="xml" extension=".xml"/>
-      <test name="javassist.JvstTest" outfile="TestLog" />
-    </junit>
-    <move file="${test.lib.dir}/emptyorig.jar"
-          tofile="${test.lib.dir}/empty.jar" />
-  </target>
-
-  <target name="sample" depends="compile">
-    <javac srcdir="${basedir}"
-           destdir="${build.classes.dir}"
-           debug="on"
-           deprecation="on"
-           optimize="off"
-           includes="sample/**"
-           excludes="sample/hotswap/**,sample/evolve/sample/**">
-            <classpath refid="classpath"/>
-    </javac>
-
-    <copy file="sample/vector/Test.j"
-          todir="${build.classes.dir}/sample/vector"/>
-
-    <javac srcdir="${basedir}/sample/evolve"
-           destdir="${build.classes.dir}/sample/evolve/"
-           debug="on"
-           deprecation="on"
-           optimize="off"
-           includes="sample/**">
-            <classpath refid="classpath"/>
-    </javac>
-    <copy todir="${build.classes.dir}/sample/evolve">
-      <fileset dir="sample/evolve"/>
-    </copy>
-    <copy file="${build.classes.dir}/sample/evolve/WebPage.class"
-          tofile="${build.classes.dir}/sample/evolve/WebPage.class.0"/>
-    <copy file="${build.classes.dir}/sample/evolve/sample/evolve/WebPage.class"
-          tofile="${build.classes.dir}/sample/evolve/WebPage.class.1"/>
-
-    <javac srcdir="${basedir}/sample/hotswap"
-           destdir="${build.classes.dir}"
-           debug="on"
-           deprecation="on"
-           optimize="off"
-           includes="*">
-            <classpath refid="classpath"/>
-    </javac>
-    <mkdir dir="${build.classes.dir}/logging"/>
-    <javac srcdir="${basedir}/sample/hotswap/logging"
-           destdir="${build.classes.dir}/logging"
-           debug="on"
-           deprecation="on"
-           optimize="off"
-           includes="*">
-            <classpath refid="classpath"/>
-    </javac>
-    <echo>To run the sample programs without ant, change the current directory 
-to ${build.classes.dir}.</echo>
-  </target>
-
-  <target name="jar" depends="compile18">
-    <jar jarfile="${target.jar}" update="true" manifest="${src.dir}/META-INF/MANIFEST.MF">
-      <fileset dir="${build.classes.dir}">
-      	  <include name="**/*.class"/>
-      </fileset>
-     </jar>
-    <jar jarfile="${target-src.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">
-      <fileset dir="${src.dir}">
-        <include name="javassist/**"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="javadocs">
-  	<mkdir dir="html"/>
-    <javadoc
-           Locale="en_US"
-           packagenames="javassist.*"
-           excludepackagenames="javassist.compiler.*,javassist.convert.*,javassist.scopedpool.*,javassist.bytecode.stackmap.*"
-           sourcepath="src/main"
-           defaultexcludes="yes"
-           destdir="html"
-           author="true"
-           version="true"
-           use="true"
-           public="true"
-           nohelp="true"
-           windowtitle="Javassist API">
-      <doctitle><![CDATA[<h1>Javassist</h1>]]></doctitle>
-      <bottom><![CDATA[<i>Javassist, a Java-bytecode translator toolkit.<br>
-Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.</i>]]></bottom>
-    </javadoc>
-  </target>
-
-  <target name="dist" depends="jar,javadocs">
-  	<delete file="${dist-version}.zip"/>
-  	<delete file="TestLog.xml"/>
-    <zip zipfile="${dist-version}.zip">
-       <zipfileset dir="${basedir}" prefix="${dist-version}">
-       	  <include name="html/**"/>
-       	  <include name="sample/**"/>
-       	  <include name="src/main/**"/>
-       	  <include name="tutorial/**"/>
-       	  <include name="*.html"/>
-       	  <include name="*.xml"/>
-       	  <include name="${target.jar}"/>
-       </zipfileset>
-    </zip>
-  </target>
-
-  <target name="clean">
-    <delete dir="html"/>
-    <delete dir="${build.dir}"/>
-    <delete file="${target.jar}"/>
-    <delete file="${dist-version}.zip"/>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Run samples                                                         -->
-  <!-- =================================================================== -->
-
-  <target name = "sample-all"
-          depends="sample-test,sample-reflect,sample-duplicate,sample-vector">
-    <echo>** please run sample-rmi, sample-evolve, and</echo>
-    <echo>   sample-hotswap (or -hotswap5) separately **</echo>
-  </target>
-
-  <target name = "sample-test" depends="sample" >
-    <java fork="true" dir="${run.dir}" classname="sample.Test">
-      <classpath refid="classpath"/>
-    </java>
-  </target>
-
-  <target name = "sample-reflect" depends="sample" >
-    <java fork="true" dir="${run.dir}" classname="javassist.tools.reflect.Loader">
-      <classpath refid="classpath"/>
-      <arg line="sample.reflect.Main Joe" />
-    </java>
-  </target>
-
-  <target name = "sample-duplicate" depends="sample" >
-    <echo>run sample.duplicate.Viewer without reflection</echo>
-    <java fork="true" dir="${run.dir}" classname="sample.duplicate.Viewer">
-      <classpath refid="classpath"/>
-    </java>
-    <echo>run sample.duplicate.Viewer with reflection</echo>
-    <java fork="true" dir="${run.dir}" classname="sample.duplicate.Main">
-      <classpath refid="classpath"/>
-    </java>
-  </target>
-
-  <target name = "sample-vector" depends="sample" >
-    <echo>sample.preproc.Compiler sample/vector/Test.j</echo>
-    <java fork="true" dir="${run.dir}" classname="sample.preproc.Compiler">
-      <classpath refid="classpath"/>
-      <arg line="sample/vector/Test.j"/>
-    </java>
-    <echo>javac sample/vector/Test.java</echo>
-    <javac srcdir="${build.classes.dir}"
-           destdir="${build.classes.dir}"
-           includes="sample/vector/Test.java">
-            <classpath refid="classpath"/>
-    </javac>
-    <java fork="true" dir="${run.dir}" classname="sample.vector.Test" />
-  </target>
-
-  <target name = "sample-rmi" depends="sample" >
-    <echo>** Please open sample/rmi/webdemo.html with your browser **</echo>
-    <java fork="true" dir="${run.dir}" classname="sample.rmi.Counter">
-      <classpath refid="classpath"/>
-      <arg value="5001" />
-    </java>
-  </target>
-
-  <target name = "sample-evolve" depends="sample" >
-    <echo>** Please open http://localhost:5003/demo.html with your browser **</echo>
-    <java fork="true" dir="${run.dir}" classname="sample.evolve.DemoLoader">
-      <classpath refid="classpath"/>
-      <arg value="5003" />
-    </java>
-  </target>
-
-  <!-- for JDK 1.4 -->
-  <target name = "sample-hotswap" depends="sample">
-    <echo>** JAVA_HOME/lib/tools.jar must be included in CLASS_PATH</echo>
-    <echo>** for JDK 1.4</echo>
-    <java fork="true" dir="${run.dir}" classname="Test">
-      <jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000" />
-      <classpath refid="classpath"/>
-    </java>
-  </target>
-
-  <!-- for Java 5 -->
-  <target name = "sample-hotswap5" depends="sample">
-    <echo>** JAVA_HOME/lib/tools.jar must be included in CLASS_PATH</echo>
-    <echo>** for JDK 1.5 or later</echo>
-    <java fork="true" dir="${run.dir}" classname="Test">
-      <jvmarg line="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000" />
-      <classpath refid="classpath"/>
-    </java>
-  </target>
-</project>

pom.xml

@@ -7,7 +7,7 @@
   	Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation
     simple.  It is a class library for editing bytecodes in Java.
   </description>
-  <version>3.29.2-GA</version>
+  <version>3.29.3-GA-SNAPSHOT</version>
   <name>Javassist</name>
   <url>http://www.javassist.org/</url>
 
@@ -138,18 +138,17 @@
     </snapshotRepository>
   </distributionManagement>
   <build>
-    <sourceDirectory>src/main/</sourceDirectory>
-    <testSourceDirectory>src/test/</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-      </testResource>
-    </testResources>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.10.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -161,7 +160,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.18.1</version>
+        <version>3.0.0-M7</version>
         <configuration>
           <includes>
             <include>javassist/JvstTest.java</include>
@@ -176,20 +175,20 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.6</version>
+        <version>3.2.2</version>
         <configuration>
           <archive>
             <manifest>
               <mainClass>javassist.CtClass</mainClass>
               <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
             </manifest>
-            <manifestFile>src/main/META-INF/MANIFEST.MF</manifestFile>
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
           </archive>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.0.4</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -203,7 +202,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.4.1</version>
 	<configuration>
 	  <attach>true</attach>
           <excludePackageNames>javassist.compiler:javassist.convert:javassist.scopedpool:javassist.bytecode.stackmap</excludePackageNames>

src/main/javassist/CtClass.java → src/main/java/javassist/CtClass.java

@@ -26,6 +26,7 @@ import java.io.OutputStream;
 import java.net.URL;
 import java.security.ProtectionDomain;
 import java.util.Collection;
+import java.util.Properties;
 
 import javassist.bytecode.ClassFile;
 import javassist.bytecode.Descriptor;
@@ -69,7 +70,7 @@ public abstract class CtClass {
     /**
      * The version number of this release.
      */
-    public static final String version = "3.29.2-GA";
+    public static final String version = readProductVersion();
 
     /**
      * Prints the version number and the copyright notice.
@@ -583,7 +584,7 @@ public abstract class CtClass {
      * For decoding, use <code>javassist.Modifier</code>.
      *
      * <p>If the class is a static nested class (a.k.a. static inner class),
-     * the returned modifiers include <code>Modifier.STATIC</code>. 
+     * the returned modifiers include <code>Modifier.STATIC</code>.
      *
      * @see Modifier
      */
@@ -785,7 +786,7 @@ public abstract class CtClass {
     /**
      * Returns the immediately enclosing method of this class.
      * This method works only with JDK 1.5 or later.
-     * 
+     *
      * @return null if this class is not a local class or an anonymous
      * class.
      * @deprecated The enclosing method might be a constructor.
@@ -818,7 +819,7 @@ public abstract class CtClass {
     /**
      * Makes a new public nested class.  If this method is called,
      * the <code>CtClass</code>, which encloses the nested class, is modified
-     * since a class file includes a list of nested classes.  
+     * since a class file includes a list of nested classes.
      *
      * <p>The current implementation only supports a static nested class.
      * <code>isStatic</code> must be true.
@@ -1443,7 +1444,7 @@ public abstract class CtClass {
      * <p>If <code>ClassPool.doPruning</code> is true, the automatic pruning
      * is on by default.  Otherwise, it is off.  The default value of
      * <code>ClassPool.doPruning</code> is false.
-     * 
+     *
      * @param stop      disallow pruning if true.  Otherwise, allow.
      * @return the previous status of pruning.  true if pruning is already stopped.
      *
@@ -1467,7 +1468,7 @@ public abstract class CtClass {
      *
      * <p><code>toBytecode()</code>, <code>writeFile()</code>, and
      * <code>toClass()</code> internally call this method if
-     * automatic pruning is on. 
+     * automatic pruning is on.
      *
      * <p>According to some experiments, pruning does not really reduce
      * memory consumption.  Only about 20%.  Since pruning takes time,
@@ -1685,4 +1686,14 @@ public abstract class CtClass {
      * This method is overridden by CtClassType.
      */
     void compress() {}
+
+    private static String readProductVersion() {
+        try {
+        final Properties properties = new Properties();
+            properties.load(CtClass.class.getClassLoader().getResourceAsStream(".properties"));
+        return properties.getProperty("product.version");
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to read a resource '.properties' from the classpath. (Packaging issue)", e);
+        }
+    }
 }