Skip to content

Commit bd8b4eb

Browse files
authored
Merge pull request #5382 from dizzzz/feature/reduceWarningsDuringBuild
[ignore] reduce build warnings
2 parents f90a462 + 5dcc2b7 commit bd8b4eb

File tree

10 files changed

+42
-8
lines changed

10 files changed

+42
-8
lines changed

exist-core/pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,6 +1084,26 @@ The BaseX Team. The original license statement is also included below.]]></pream
10841084
</executions>
10851085
</plugin>
10861086

1087+
<plugin>
1088+
<groupId>software.xdev</groupId>
1089+
<artifactId>find-and-replace-maven-plugin</artifactId>
1090+
<executions>
1091+
<execution>
1092+
<id>replace-underscore-with-hyphen</id>
1093+
<phase>process-sources</phase>
1094+
<goals>
1095+
<goal>file-contents</goal>
1096+
</goals>
1097+
<configuration>
1098+
<baseDir>target/generated-sources/antlr/org/exist/xquery/parser/</baseDir>
1099+
<fileMask>XQueryLexer.java</fileMask>
1100+
<findRegex>new Integer</findRegex>
1101+
<replaceValue>Integer.valueOf</replaceValue>
1102+
</configuration>
1103+
</execution>
1104+
</executions>
1105+
</plugin>
1106+
10871107
<plugin>
10881108
<artifactId>maven-compiler-plugin</artifactId>
10891109
<executions>

exist-core/src/main/java/org/exist/collections/triggers/FilteringTrigger.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
*
3030
* @deprecated use SAXTrigger
3131
*/
32+
@Deprecated
3233
public abstract class FilteringTrigger extends SAXTrigger {
3334

3435
}

exist-core/src/main/java/org/exist/scheduler/UserXQueryJob.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ public String getXQueryResource() {
117117
* @return The User for this Job
118118
* @deprecated use getCurrentSubject method
119119
*/
120+
@Deprecated
120121
public Subject getUser() {
121122
return subject;
122123
}

exist-core/src/main/java/org/exist/security/User.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public interface User extends Principal {
103103
* @return The users password
104104
* @deprecated
105105
*/
106+
@Deprecated
106107
String getPassword();
107108

108109
@Deprecated

exist-core/src/main/java/org/exist/security/internal/AccountImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public AccountImpl(final AbstractRealm realm, final Configuration configuration,
241241
* @return Description of the Return Value
242242
* @deprecated
243243
*/
244-
@Override
244+
@Override @Deprecated
245245
public final String getPassword() {
246246
return password;
247247
}

exist-core/src/main/java/org/exist/storage/BrokerPool.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,7 @@ public ThreadGroup getThreadGroup() {
843843
* @deprecated use countActiveBrokers
844844
*/
845845
//TODO : rename as getActiveBrokers ?
846+
@Deprecated
846847
public int active() {
847848
return activeBrokers.size();
848849
}

exist-core/src/main/java/org/exist/util/ByteConversion.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class ByteConversion {
4242
* @deprecated reads the lowest byte first. will be replaced with
4343
* {@link #byteToIntH(byte[], int)} for consistency.
4444
*/
45+
@Deprecated
4546
public final static int byteToInt(final byte[] data, final int start ) {
4647
return ( data[start] & 0xff ) |
4748
( ( data[start + 1] & 0xff ) << 8 ) |
@@ -144,6 +145,7 @@ public final static long byteToLong(final ByteBuffer buf) {
144145
*
145146
* @return the short integer
146147
*/
148+
@Deprecated
147149
public final static short byteToShort( final byte[] data, final int start ) {
148150
return (short) ( ( ( data[start + 1] & 0xff ) << 8 ) |
149151
( data[start] & 0xff ) );
@@ -190,6 +192,7 @@ public final static short byteToShortH(final ByteBuffer buf) {
190192
* @param start the offset
191193
* @return the byte array
192194
*/
195+
@Deprecated
193196
public final static byte[] intToByte( final int v, final byte[] data, final int start ) {
194197
data[start] = (byte) ( ( v >>> 0 ) & 0xff );
195198
data[start + 1] = (byte) ( ( v >>> 8 ) & 0xff );
@@ -302,6 +305,7 @@ public final static byte[] longToByte( final long v ) {
302305
* @param start the offset
303306
* @return the byte array
304307
*/
308+
@Deprecated
305309
public final static byte[] shortToByte( final short v, final byte[] data, final int start ) {
306310
data[start] = (byte) ( ( v >>> 0 ) & 0xff );
307311
data[start + 1] = (byte) ( ( v >>> 8 ) & 0xff );

exist-core/src/main/java/org/exist/util/NamedThreadFactory.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public NamedThreadFactory(final String instanceId, final String nameBase) {
6868
*
6969
* @deprecated use {@link #NamedThreadFactory(Database, String)}.
7070
*/
71+
@Deprecated
7172
public NamedThreadFactory(final Database database, final String nameBase) {
7273
this(database.getThreadGroup(), database.getId(), nameBase);
7374
}

exist-core/src/main/java/org/exist/xmldb/RemoteXMLResource.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ public RemoteXMLResource(final RemoteCollection parent, final XmldbURI docId, fi
110110
* @throws XMLDBException if an error occurs during construction
111111
* @deprecated Use {@link #RemoteXMLResource(RemoteCollection, int, int, XmldbURI, Optional, Optional)}.
112112
*/
113+
@Deprecated
113114
public RemoteXMLResource(final RemoteCollection parent, final XmldbURI docId, final Optional<String> id, final Optional<String> type)
114115
throws XMLDBException {
115116
this(parent, -1, -1, docId, id, type);

exist-parent/pom.xml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,11 @@
617617

618618
<pluginManagement>
619619
<plugins>
620+
<plugin>
621+
<groupId>software.xdev</groupId>
622+
<artifactId>find-and-replace-maven-plugin</artifactId>
623+
<version>1.0.2</version>
624+
</plugin>
620625
<plugin>
621626
<groupId>org.apache.maven.plugins</groupId>
622627
<artifactId>maven-clean-plugin</artifactId>
@@ -979,6 +984,11 @@
979984
<exclude>FDB-backport-LGPL-21-ONLY-license.xml.template.txt</exclude>
980985
<exclude>LGPL-21-license.template.txt</exclude>
981986
<exclude>LGPL-21-license.txt</exclude>
987+
<exclude>LGPL-21-license.template.txt</exclude>
988+
<exclude>**/README.md</exclude>
989+
<exclude>**/README</exclude>
990+
<exclude>**/LICENSE</exclude>
991+
<exclude>**/*.xar</exclude>
982992
</excludes>
983993
</licenseSet>
984994
</licenseSets>
@@ -1006,13 +1016,6 @@
10061016
<email>${contact.email}</email>
10071017
<url>${project.organization.url}</url>
10081018
</properties>
1009-
<excludes>
1010-
<exclude>LGPL-21-license.template.txt</exclude>
1011-
<exclude>**/README.md</exclude>
1012-
<exclude>**/README</exclude>
1013-
<exclude>**/LICENSE</exclude>
1014-
<exclude>**/*.xar</exclude>
1015-
</excludes>
10161019
<encoding>${project.build.sourceEncoding}</encoding>
10171020
</configuration>
10181021
<executions>
@@ -1041,6 +1044,7 @@
10411044
<artifactId>maven-resources-plugin</artifactId>
10421045
<configuration>
10431046
<encoding>${project.build.sourceEncoding}</encoding>
1047+
<propertiesEncoding>${project.build.sourceEncoding}</propertiesEncoding>
10441048
</configuration>
10451049
</plugin>
10461050
<plugin>

0 commit comments

Comments
 (0)