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 2017/12/02 23:05:49 UTC
svn commit: r1817002 - in /db/derby/code/trunk/java:
build/org/apache/derbyPreBuild/ engine/org/apache/derby/iapi/services/info/
Author: rhillegas
Date: Sat Dec 2 23:05:49 2017
New Revision: 1817002
URL: http://svn.apache.org/viewvc?rev=1817002&view=rev
Log:
DERBY-6945: Remove dependency of proposed modules on derbyPreBuild; commit derby-6945-01-aa-remove_derbyPreBuild_dep.diff.
Modified:
db/derby/code/trunk/java/build/org/apache/derbyPreBuild/ReleaseProperties.java
db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java
Modified: db/derby/code/trunk/java/build/org/apache/derbyPreBuild/ReleaseProperties.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyPreBuild/ReleaseProperties.java?rev=1817002&r1=1817001&r2=1817002&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyPreBuild/ReleaseProperties.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyPreBuild/ReleaseProperties.java Sat Dec 2 23:05:49 2017
@@ -75,7 +75,7 @@ public class ReleaseProperties extends T
"# See the License for the specific language governing permissions and" + LS +
"# limitations under the License." + LS + LS;
- public final static int MAINT_ENCODING = 1000000;
+ public final static int MAINT_ENCODING = org.apache.derby.iapi.services.info.PropertyNames.MAINT_ENCODING;
private final static int MAINT_LENGTH = 7;
private final static String DRDA_MAINT = "drdamaint";
Modified: db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml?rev=1817002&r1=1817001&r2=1817002&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml Sat Dec 2 23:05:49 2017
@@ -25,14 +25,16 @@
<property name="properties.dir" value="tools/ant/properties"/>
<!-- Significant dirs -->
<property file="${properties.dir}/dirs.properties"/>
+ <!-- Compiler flags -->
+ <property file="${properties.dir}/defaultcompiler.properties"/>
<!-- Targets -->
<target name="build" depends="compile"/>
<target name="compile">
<javac
- source="1.6"
- target="1.6"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="true"
depend="${depend}"
@@ -43,7 +45,7 @@
srcdir="${derby.build.src.dir}"
destdir="${out.dir}"
includeantruntime="false">
- <include name="org/apache/derbyPreBuild/**"/>
+ <include name="org/apache/derbyPreBuild/** ../engine/org/apache/derby/iapi/services/info/PropertyNames.java"/>
<classpath>
<pathelement path="${ant.core.lib}"/>
</classpath>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java?rev=1817002&r1=1817001&r2=1817002&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java Sat Dec 2 23:05:49 2017
@@ -119,7 +119,7 @@ public final class ProductVersionHolder
private static final String ALPHA = "alpha";
private static final String BETA = "beta";
- public final static int MAINT_ENCODING = org.apache.derbyPreBuild.ReleaseProperties.MAINT_ENCODING;
+ public final static int MAINT_ENCODING = PropertyNames.MAINT_ENCODING;
private String productVendorName;
private String productName;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java?rev=1817002&r1=1817001&r2=1817002&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java Sat Dec 2 23:05:49 2017
@@ -40,5 +40,8 @@ public abstract class PropertyNames
PRODUCT_BETA_VERSION = "derby.version.beta",
PRODUCT_BUILD_NUMBER = "derby.build.number",
PRODUCT_WHICH_ZIP_FILE = "derby.product.file";
+
+ public final static int MAINT_ENCODING = 1000000;
+
}