You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2018/02/14 01:50:58 UTC
svn commit: r1824192 - in /db/derby/code/trunk: build.xml
java/build/org/apache/derbyBuild/classlister.java
java/build/org/apache/derbyBuild/maintversion2props.java tools/jar/
Author: rhillegas
Date: Wed Feb 14 01:50:58 2018
New Revision: 1824192
URL: http://svn.apache.org/viewvc?rev=1824192&view=rev
Log:
DERBY-6945: Remove obsolete classlister program; commit derby-6945-20-aa-removeClasslister.diff.
Removed:
db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java
db/derby/code/trunk/tools/jar/
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/build/org/apache/derbyBuild/maintversion2props.java
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1824192&r1=1824191&r2=1824192&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Feb 14 01:50:58 2018
@@ -1316,10 +1316,6 @@
<fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
</delete>
- <concat destfile="${derby.jar.dir}/lists/otherDerbyClasses.properties">
- <fileset dir="${basedir}/tools/jar" includes="*DBMS*.properties"/>
- </concat>
-
<mkdir dir="${derby.jar.dir}/lists/org/apache/derby"/>
<java classname="org.apache.derbyBuild.propertyconfig" fork="yes">
<arg value="${out.dir}/org/apache/derby/modules.properties"/>
@@ -1448,7 +1444,7 @@
<fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
</delete>
- <echo level="info" message=" creating new tools.properties file "/>
+ <echo level="info" message=" creating new tools info.properties file "/>
<antcall target="infowriter">
<param name="info.buildnumber" value="${changenumber}"/>
<param name="info.iname" value="Apache Derby Tools"/>
@@ -1501,7 +1497,7 @@
<fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
</delete>
- <echo level="info" message=" creating new tools.properties file "/>
+ <echo level="info" message=" creating new optionaltools info.properties file "/>
<antcall target="infowriter">
<param name="info.buildnumber" value="${changenumber}"/>
<param name="info.iname" value="Apache Derby Optional Tools"/>
@@ -1548,7 +1544,7 @@
<fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
</delete>
- <echo level="info" message=" creating new net.properties file "/>
+ <echo level="info" message=" creating new net info.properties file "/>
<antcall target="infowriter">
<param name="info.buildnumber" value="${changenumber}"/>
<param name="info.iname" value="Apache Derby Network Server"/>
@@ -1640,13 +1636,6 @@
</target>
- <!-- Add extra classes to jar file if building for Java 8 -->
- <target name="derbyclientjar.1.8">
- <concat destfile="${derby.jar.dir}/lists/dnc.properties" append="true">
- <fileset file="${basedir}/tools/jar/dnc.1.8.properties" />
- </concat>
- </target>
-
<!-- - - - - - - - - - - - - - derbyshared.jar target - - - - - - - - - - - -->
<target name="derbysharedjar" depends="setsanityname">
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/maintversion2props.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/maintversion2props.java?rev=1824192&r1=1824191&r2=1824192&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/maintversion2props.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/maintversion2props.java Wed Feb 14 01:50:58 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derbyBuild.classlister
+ Derby - Class org.apache.derbyBuild.maintversion2props
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with