[ 
https://issues.apache.org/jira/browse/DERBY-6945?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Rick Hillegas updated DERBY-6945:
---------------------------------
    Attachment: derby-6945-04-aa-moveRunClass.diff

Attaching derby-6945-04-aa-moveRunClass.diff. This patch moves run.java into 
its own package so that derbyrun.jar and derbytools.jar will not share a 
package. I have verified that the overlap no longer appears in the output of 
VetJigsawTest. I am running regression tests now.

Touches the following files:

-------------------------------------

M       build.xml
M       tools/ant/properties/dirs.properties

Added a separate compile-time target for the single class in derbyrun.jar. 
Adjusted the MANIFEST of derbyrun.jar to refer to the new package location of 
the run class.

-------------------------------------

M       
java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents
M       
java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents
A       java/run
A       java/run/build.xml
A       java/run/org
A       java/run/org/apache
A       java/run/org/apache/derby
A       java/run/org/apache/derby/run
A  +    java/run/org/apache/derby/run/run.java
D       java/tools/org/apache/derby/iapi/tools/run.java

Move run.java out of java/tools/org/apache/derby/iapi/tools and into 
java/run/org/apache/derby/run

-------------------------------------

M       
java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java

Adjust the class name of run.java so that the test can find the derbyrun.jar 
artifact.


> Re-package Derby as a collection of jigsaw modules
> --------------------------------------------------
>
>                 Key: DERBY-6945
>                 URL: https://issues.apache.org/jira/browse/DERBY-6945
>             Project: Derby
>          Issue Type: Improvement
>    Affects Versions: 10.13.1.2
>            Reporter: Rick Hillegas
>         Attachments: derby-6945-01-aa-remove_derbyPreBuild_dep.diff, 
> derby-6945-02-ab-newDerbySharedJar.diff, 
> derby-6945-02-ac-newDerbySharedJar.diff, derby-6945-03-aa-partitionTest.diff, 
> derby-6945-04-aa-moveRunClass.diff, jdeps.out.tar
>
>
> Once we commit to building with Java 9 (see DERBY-6856), we should consider 
> re-packaging Derby as a set of jigsaw modules. This would result in a 
> different set of release artifacts. This might be a good opportunity to 
> address the Tomcat artifactory issues raised by issue DERBY-6944.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

Reply via email to