Skip to content

Commit 354dbd7

Browse files
mboapachemboapache
authored
JDO-845: Update JDO dependencies (#98)
* JDO-845: Update JDO dependencies * JDO-845: new version of code formatter
1 parent a7bd089 commit 354dbd7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+191
-57
lines changed

‎api/src/main/java/javax/jdo/Constants.java

+79
Large diffs are not rendered by default.

‎api/src/main/java/javax/jdo/Enhancer.java

+18
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,13 @@ public class Enhancer {
7878

7979
/** New Line */
8080
private static final char NL = '\n'; // NOI18N
81+
8182
/** Jar file suffix */
8283
private static final String JAR_FILE_SUFFIX = ".jar"; // NOI18N
84+
8385
/** JDO Metadata file suffix */
8486
private static final String JDO_FILE_SUFFIX = ".jdo"; // NOI18N
87+
8588
/** Class file suffix */
8689
private static final String CLASS_FILE_SUFFIX = ".class"; // NOI18N
8790

@@ -92,37 +95,52 @@ public class Enhancer {
9295

9396
/** Error indicator */
9497
private boolean error = false;
98+
9599
/** If set, process parameters, print usage, and exit. */
96100
private boolean printAndExit = false;
97101

98102
/** Persistence Units */
99103
private final List<String> persistenceUnitNames = new ArrayList<>();
104+
100105
/** Target Directory Parameter */
101106
private String directoryName = null;
107+
102108
/** ClassLoader for JDOEnhancer */
103109
private ClassLoader loader = null;
110+
104111
/** Classpath (-cp) parameter */
105112
private String classPath = null;
113+
106114
/** Check Only flag */
107115
private boolean checkOnly = false;
116+
108117
/** Verbose flag */
109118
private boolean verbose = false;
119+
110120
/** Recurse flag */
111121
private boolean recurse = false;
122+
112123
/** Error messages should be empty unless there is an error */
113124
private final StringBuilder errorBuffer = new StringBuilder();
125+
114126
/** Verbose messages are always collected but only output if verbose flag is set */
115127
private final StringBuilder verboseBuffer = new StringBuilder();
128+
116129
/** File Names */
117130
private List<String> fileNames = new ArrayList<>();
131+
118132
/** Class File Names */
119133
private final List<String> classFileNames = new ArrayList<>();
134+
120135
/** JDO File Names */
121136
private final List<String> jdoFileNames = new ArrayList<>();
137+
122138
/** Jar File Names */
123139
private final List<String> jarFileNames = new ArrayList<>();
140+
124141
/** The number of classes validated by the JDOEnhancer */
125142
private int numberOfValidatedClasses = 0;
143+
126144
/** The number of classes enhanced by the JDOEnhancer */
127145
private int numberOfEnhancedClasses = 0;
128146

‎api/src/main/java/javax/jdo/spi/JDOImplHelper.java

+2
Original file line numberDiff line numberDiff line change
@@ -798,6 +798,7 @@ private static Locale getLocale(String s) {
798798
String variant = s.substring(secondUnderbar + 1);
799799
return new Locale(lang, country, variant);
800800
}
801+
801802
/**
802803
* Determine if a class is loadable in the current environment.
803804
*
@@ -992,6 +993,7 @@ byte[] getFieldFlags() {
992993
Class<?> getPersistenceCapableSuperclass() {
993994
return persistenceCapableSuperclass;
994995
}
996+
995997
/**
996998
* This is an instance of <code>PersistenceCapable</code>, used at runtime to create new
997999
* instances.

‎exectck/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@
6969

7070
<build>
7171
<plugins>
72+
<plugin>
73+
<artifactId>maven-plugin-plugin</artifactId>
74+
<configuration>
75+
<goalPrefix>exectck</goalPrefix>
76+
</configuration>
77+
</plugin>
7278
<plugin>
7379
<groupId>org.apache.maven.plugins</groupId>
7480
<artifactId>maven-deploy-plugin</artifactId>

‎exectck/src/main/java/org/apache/jdo/exectck/Enhance.java

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public class Enhance extends AbstractTCKMojo {
8080
+ "inheritance"
8181
+ File.separator
8282
};
83+
8384
/** Location of TCK generated output. */
8485
@Parameter(property = "jdo.tck.doEnhance", defaultValue = "true", required = true)
8586
private boolean doEnhance;

‎exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java

+2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@
3333
public class InstallSchema extends AbstractTCKMojo {
3434

3535
private static final String DB_DIR_NAME = "database"; // NOI18N
36+
3637
/** List of mappings required by the current configuration */
3738
protected Collection<String> mappings = new HashSet<>();
39+
3840
/** Location of TCK generated output. */
3941
@Parameter(property = "jdo.tck.doInstallSchema", defaultValue = "true", required = true)
4042
private boolean doInstallSchema;

‎exectck/src/main/java/org/apache/jdo/exectck/Utilities.java

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class Utilities {
3737
private Utilities() {
3838
// This method is deliberately left empty.
3939
}
40+
4041
/*
4142
* Return the current date/time as a String.
4243
*/

‎parent-pom/pom.xml

+33-57
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache</groupId>
2323
<artifactId>apache</artifactId>
24-
<version>26</version>
24+
<version>33</version>
2525
<relativePath />
2626
</parent>
2727

@@ -166,6 +166,21 @@
166166
<project.build.outputTimestamp>1661453031</project.build.outputTimestamp>
167167
<showWarnings></showWarnings>
168168
<compilerArgument></compilerArgument>
169+
<maven.compiler.target>8</maven.compiler.target>
170+
171+
<version.maven-plugin-api>3.9.9</version.maven-plugin-api>
172+
<version.javax.transaction-api>1.3</version.javax.transaction-api>
173+
<version.junit-jupiter>5.11.3</version.junit-jupiter>
174+
<version.junit-platform>1.11.3</version.junit-platform>
175+
<version.javax.persistence>2.2.1</version.javax.persistence>
176+
<version.derby>10.14.2.0</version.derby>
177+
<version.commons-io>2.17.0</version.commons-io>
178+
<version.spring-beans>5.3.39</version.spring-beans>
179+
<version.commons-logging>1.2</version.commons-logging>
180+
<version.glassfish-corba-omgapi>4.2.5</version.glassfish-corba-omgapi>
181+
<version.maven-changes-plugin>2.12.1</version.maven-changes-plugin>
182+
<version.maven-bundle-plugin>5.1.9</version.maven-bundle-plugin>
183+
<version.fmt-maven-plugin>2.25</version.fmt-maven-plugin>
169184
</properties>
170185

171186
<dependencyManagement>
@@ -188,79 +203,74 @@
188203
<dependency>
189204
<groupId>org.apache.maven</groupId>
190205
<artifactId>maven-plugin-api</artifactId>
191-
<version>3.8.5</version>
206+
<version>${version.maven-plugin-api}</version>
192207
<scope>provided</scope>
193208
</dependency>
194209
<dependency>
195210
<groupId>javax.transaction</groupId>
196211
<artifactId>javax.transaction-api</artifactId>
197-
<version>1.3</version>
212+
<version>${version.javax.transaction-api}</version>
198213
</dependency>
199214
<dependency>
200215
<groupId>org.junit.jupiter</groupId>
201216
<artifactId>junit-jupiter-engine</artifactId>
202-
<version>5.10.0</version>
217+
<version>${version.junit-jupiter}</version>
203218
</dependency>
204219
<dependency>
205220
<groupId>org.junit.jupiter</groupId>
206221
<artifactId>junit-jupiter-params</artifactId>
207-
<version>5.10.0</version>
222+
<version>${version.junit-jupiter}</version>
208223
</dependency>
209224
<dependency>
210225
<groupId>org.junit.platform</groupId>
211226
<artifactId>junit-platform-suite-api</artifactId>
212-
<version>1.10.0</version>
227+
<version>${version.junit-platform}</version>
213228
</dependency>
214229
<dependency>
215230
<groupId>org.junit.platform</groupId>
216231
<artifactId>junit-platform-launcher</artifactId>
217-
<version>1.10.0</version>
232+
<version>${version.junit-platform}</version>
218233
</dependency>
219234
<dependency>
220235
<groupId>org.junit.platform</groupId>
221236
<artifactId>junit-platform-console</artifactId>
222-
<version>1.10.0</version>
237+
<version>${version.junit-platform}</version>
223238
</dependency>
224239
<dependency>
225240
<groupId>org.eclipse.persistence</groupId>
226241
<artifactId>javax.persistence</artifactId>
227-
<version>2.2.1</version>
242+
<version>${version.javax.persistence}</version>
228243
</dependency>
229244
<dependency>
230245
<groupId>org.apache.derby</groupId>
231246
<artifactId>derby</artifactId>
232-
<version>10.14.2.0</version>
247+
<version>${version.derby}</version>
233248
</dependency>
234249
<dependency>
235250
<groupId>org.apache.derby</groupId>
236251
<artifactId>derbytools</artifactId>
237-
<version>10.14.2.0</version>
252+
<version>${version.derby}</version>
238253
</dependency>
239254
<dependency>
240255
<groupId>commons-io</groupId>
241256
<artifactId>commons-io</artifactId>
242-
<version>2.14.0</version>
257+
<version>${version.commons-io}</version>
243258
</dependency>
244259
<dependency>
245260
<groupId>org.springframework</groupId>
246261
<artifactId>spring-beans</artifactId>
247-
<version>5.3.20</version>
262+
<version>${version.spring-beans}</version>
248263
</dependency>
249264
<dependency>
250265
<groupId>commons-logging</groupId>
251266
<artifactId>commons-logging</artifactId>
252-
<version>1.2</version>
253-
</dependency>
254-
<dependency>
255-
<groupId>org.apache.maven.plugin-tools</groupId>
256-
<artifactId>maven-plugin-annotations</artifactId>
257-
<version>3.6.4</version>
267+
<version>${version.commons-logging}</version>
258268
</dependency>
259269
<dependency>
260270
<!-- License: EDL 1.0 https://www.eclipse.org/org/documents/edl-v10.php -->
261271
<groupId>org.glassfish.corba</groupId>
262272
<artifactId>glassfish-corba-omgapi</artifactId>
263-
<version>4.2.4</version>
273+
<version>${version.glassfish-corba-omgapi}</version>
264274
</dependency>
265275
</dependencies>
266276
</dependencyManagement>
@@ -269,54 +279,20 @@
269279

270280
<pluginManagement>
271281
<plugins>
272-
<plugin>
273-
<artifactId>maven-compiler-plugin</artifactId>
274-
<version>3.10.1</version>
275-
</plugin>
276-
<plugin>
277-
<artifactId>maven-dependency-plugin</artifactId>
278-
<version>3.3.0</version>
279-
</plugin>
280-
<plugin>
281-
<artifactId>maven-clean-plugin</artifactId>
282-
<version>3.2.0</version>
283-
</plugin>
284-
<plugin>
285-
<artifactId>maven-assembly-plugin</artifactId>
286-
<version>3.3.0</version>
287-
</plugin>
288282
<plugin>
289283
<groupId>org.apache.maven.plugins</groupId>
290284
<artifactId>maven-changes-plugin</artifactId>
291-
<version>2.12.1</version>
292-
</plugin>
293-
<plugin>
294-
<groupId>org.apache.maven.plugins</groupId>
295-
<artifactId>maven-checkstyle-plugin</artifactId>
296-
<version>3.1.2</version>
285+
<version>${version.maven-changes-plugin}</version>
297286
</plugin>
298287
<plugin>
299288
<groupId>org.apache.felix</groupId>
300289
<artifactId>maven-bundle-plugin</artifactId>
301-
<version>5.1.6</version>
302-
</plugin>
303-
<plugin>
304-
<artifactId>maven-javadoc-plugin</artifactId>
305-
<version>3.4.0</version>
306-
</plugin>
307-
<plugin>
308-
<artifactId>org.apache.rat</artifactId>
309-
<version>0.14</version>
310-
</plugin>
311-
<plugin>
312-
<groupId>org.apache.maven.plugins</groupId>
313-
<artifactId>maven-enforcer-plugin</artifactId>
314-
<version>3.1.0</version>
290+
<version>${version.maven-bundle-plugin}</version>
315291
</plugin>
316292
<plugin>
317293
<groupId>com.spotify.fmt</groupId>
318294
<artifactId>fmt-maven-plugin</artifactId>
319-
<version>2.19</version>
295+
<version>${version.fmt-maven-plugin}</version>
320296
</plugin>
321297
</plugins>
322298
</pluginManagement>

‎tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public class FetchGroupTest extends JDO_Test {
6767
new String[] {
6868
"hiredate", "weeklyhours", "personid", "firstname", "lastname", "middlename", "birthdate"
6969
};
70+
7071
/** In org/apache/jdo/tck/pc/package.jdo, middlename is not in DFG */
7172
protected final String[] defaultMembers =
7273
new String[] {"hiredate", "weeklyhours", "personid", "firstname", "lastname", "birthdate"};
@@ -96,6 +97,7 @@ public class FetchGroupTest extends JDO_Test {
9697
"phoneNumbers",
9798
"languages"
9899
};
100+
99101
/** Address address is of type Address and is a relationship */
100102
protected final String[] relationshipMembers =
101103
new String[] {
@@ -113,6 +115,7 @@ public class FetchGroupTest extends JDO_Test {
113115
"hradvisees",
114116
"address"
115117
};
118+
116119
/** Map phoneNumbers and set languages are not relationships but are multivalued */
117120
protected final String[] multivaluedMembers =
118121
new String[] {

‎tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ protected Object detachClosure(Object pc) {
6161
byte[] cartStream = serialize(pc);
6262
return deserialize(cartStream);
6363
}
64+
6465
/** */
6566
private byte[] serialize(Object root) {
6667
try {

‎tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class AbstractFetchPlanTest extends JDO_Test {
5353
protected final String[] lowerRightGroup = new String[] {"default", "PCRect.lowerRight"};
5454
protected final String[] bothGroup =
5555
new String[] {"default", "PCRect.upperLeft", "PCRect.lowerRight"};
56+
5657
/**
5758
* @see org.apache.jdo.tck.JDO_Test#localSetUp()
5859
*/

‎tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetTransactionIsolationLevel.java

+1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ private void setTransactionIsolationLevelByAPI(String level) {
138138
closePMF();
139139
return;
140140
}
141+
141142
/** */
142143
private void getPMFsetTransactionIsolationLevelFromProperties(String level) {
143144
String property = Constants.PROPERTY_TRANSACTION_ISOLATION_LEVEL + "." + level;

‎tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/JDOConfigListener.java

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public class JDOConfigListener extends JDO_Test {
4444

4545
/** Creates a new instance of JDOConfigListener */
4646
public JDOConfigListener() {}
47+
4748
/** */
4849
private static final String ASSERTION_FAILED = "Assertions 11.1-40 failed: ";
4950

‎tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/Jdoconfig.java

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class Jdoconfig extends JDO_Test {
3838

3939
/** Creates a new instance of Jdoconfig */
4040
public Jdoconfig() {}
41+
4142
/** */
4243
private static final String ASSERTION_FAILED = "Assertion A11.1.2-1 failed: ";
4344

‎tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/Persistence.java

+2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ public class Persistence extends JDO_Test {
4141

4242
/** Creates a new instance of Jdoconfig */
4343
public Persistence() {}
44+
4445
/** */
4546
private static final String ASSERTION_FAILED = "Assertion A11.1.2-1 failed: ";
47+
4648
// Do not use superclass pmf, pm
4749
private PersistenceManagerFactory pmf = null;
4850
private PersistenceManager pm = null;

‎tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1To1AllRelationships.java

+1
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ public void testSetToNewFromMappedBySide() {
362362
failOnError();
363363
}
364364
}
365+
365366
/** */
366367
@Test
367368
public void testDeleteFromMappedSide() {

0 commit comments

Comments
 (0)