Fridrich Strba
b4e65a1a30
OBS-URL: https://build.opensuse.org/package/show/Java:packages/derby?expand=0&rev=24
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
--- build.xml 2016-09-27 18:40:46.000000000 +0200
|
|
+++ build.xml 2017-09-20 17:06:06.173755242 +0200
|
|
@@ -48,7 +48,7 @@
|
|
|
|
<target
|
|
name="buildsource"
|
|
- depends="checkCompilerLevel,init,prebuild,setCompilerProperties,felixStubs,engine,storeless,tools,drda,client,optional,build,versioninfo,localeinfo,binscripts"
|
|
+ depends="checkCompilerLevel,init,prebuild,setCompilerProperties,felixStubs,engine,storeless,tools,drda,client,build,versioninfo,localeinfo,binscripts"
|
|
description="Compile the product source (does not build the tests)."
|
|
/>
|
|
<target
|
|
@@ -1295,7 +1295,7 @@
|
|
|
|
<target
|
|
name="buildjars"
|
|
- depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyoptionaltoolsjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar,jardriftcheck"
|
|
+ depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar"
|
|
description="Build all of the Derby jar files."
|
|
/>
|
|
|
|
@@ -1735,7 +1735,6 @@
|
|
|
|
<manifest file="${derby.jar.dir}/lists/smfcmd.mf">
|
|
<attribute name="Main-Class" value="org.apache.derby.iapi.tools.run"/>
|
|
- <attribute name="Class-Path" value="derby.jar derbyclient.jar derbytools.jar derbynet.jar derbyoptionaltools.jar"/>
|
|
</manifest>
|
|
|
|
<jar destfile="${derby.jar.dir}/derbyrun.jar"
|
|
--- java/optional/org/apache/derby/optional/api/LuceneUtils.java 2016-09-27 18:40:53.000000000 +0200
|
|
+++ java/optional/org/apache/derby/optional/api/LuceneUtils.java 2017-09-20 15:44:30.478363016 +0200
|
|
@@ -109,21 +109,7 @@
|
|
@SuppressWarnings("deprecation")
|
|
public static Version currentVersion()
|
|
{
|
|
- Version retval = null;
|
|
-
|
|
- // the current version is the highest one
|
|
- for ( Version current : Version.values() )
|
|
- {
|
|
- if ( current == Version.LUCENE_CURRENT ) { continue; }
|
|
-
|
|
- if ( retval == null ) { retval = current; }
|
|
- else
|
|
- {
|
|
- if ( current.onOrAfter( retval ) ) { retval = current; }
|
|
- }
|
|
- }
|
|
-
|
|
- return retval;
|
|
+ return Version.LATEST;
|
|
}
|
|
|
|
/**
|