Skip to content

Commit a2b327c

Browse files
jboadaspivovarit
jboadas
authored and
pivovarit
committed
Move JDO from core-java to libraries (eugenp#1758)
1 parent f5f3e48 commit a2b327c

6 files changed

Lines changed: 52 additions & 55 deletions

File tree

‎core-java/pom.xml‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -177,37 +177,6 @@
177177
</exclusion>
178178
</exclusions>
179179
</dependency>
180-
<!-- JDO -->
181-
<dependency>
182-
<groupId>org.datanucleus</groupId>
183-
<artifactId>javax.jdo</artifactId>
184-
<version>3.2.0-m6</version>
185-
</dependency>
186-
<dependency>
187-
<groupId>org.datanucleus</groupId>
188-
<artifactId>datanucleus-core</artifactId>
189-
<version>5.1.0-m1</version>
190-
</dependency>
191-
<dependency>
192-
<groupId>org.datanucleus</groupId>
193-
<artifactId>datanucleus-api-jdo</artifactId>
194-
<version>5.1.0-m1</version>
195-
</dependency>
196-
<dependency>
197-
<groupId>org.datanucleus</groupId>
198-
<artifactId>datanucleus-rdbms</artifactId>
199-
<version>5.1.0-m1</version>
200-
</dependency>
201-
<dependency>
202-
<groupId>org.datanucleus</groupId>
203-
<artifactId>datanucleus-maven-plugin</artifactId>
204-
<version>5.0.2</version>
205-
</dependency>
206-
<dependency>
207-
<groupId>com.h2database</groupId>
208-
<artifactId>h2</artifactId>
209-
<version>1.4.194</version>
210-
</dependency>
211180

212181
<dependency>
213182
<groupId>org.owasp.esapi</groupId>
@@ -358,29 +327,6 @@
358327
</execution>
359328
</executions>
360329
</plugin>
361-
362-
<!-- JDO Plugin -->
363-
364-
<plugin>
365-
<groupId>org.datanucleus</groupId>
366-
<artifactId>datanucleus-maven-plugin</artifactId>
367-
<version>5.0.2</version>
368-
<configuration>
369-
<api>JDO</api>
370-
<props>${basedir}/datanucleus.properties</props>
371-
<log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
372-
<verbose>true</verbose>
373-
</configuration>
374-
<executions>
375-
<execution>
376-
<phase>process-classes</phase>
377-
<goals>
378-
<goal>enhance</goal>
379-
</goals>
380-
</execution>
381-
</executions>
382-
</plugin>
383-
384330
</plugins>
385331

386332
</build>

core-java/log4j.properties renamed to libraries/log4j.properties

File renamed without changes.

‎libraries/pom.xml‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,26 @@
5959
</execution>
6060
</executions>
6161
</plugin>
62+
<!-- JDO Plugin -->
63+
<plugin>
64+
<groupId>org.datanucleus</groupId>
65+
<artifactId>datanucleus-maven-plugin</artifactId>
66+
<version>5.0.2</version>
67+
<configuration>
68+
<api>JDO</api>
69+
<props>${basedir}/datanucleus.properties</props>
70+
<log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
71+
<verbose>true</verbose>
72+
</configuration>
73+
<executions>
74+
<execution>
75+
<phase>process-classes</phase>
76+
<goals>
77+
<goal>enhance</goal>
78+
</goals>
79+
</execution>
80+
</executions>
81+
</plugin>
6282
</plugins>
6383
</build>
6484

@@ -200,6 +220,37 @@
200220
<artifactId>jackson-databind</artifactId>
201221
<version>${jackson.version}</version>
202222
</dependency>
223+
<!-- JDO -->
224+
<dependency>
225+
<groupId>org.datanucleus</groupId>
226+
<artifactId>javax.jdo</artifactId>
227+
<version>3.2.0-m6</version>
228+
</dependency>
229+
<dependency>
230+
<groupId>org.datanucleus</groupId>
231+
<artifactId>datanucleus-core</artifactId>
232+
<version>5.1.0-m1</version>
233+
</dependency>
234+
<dependency>
235+
<groupId>org.datanucleus</groupId>
236+
<artifactId>datanucleus-api-jdo</artifactId>
237+
<version>5.1.0-m1</version>
238+
</dependency>
239+
<dependency>
240+
<groupId>org.datanucleus</groupId>
241+
<artifactId>datanucleus-rdbms</artifactId>
242+
<version>5.1.0-m1</version>
243+
</dependency>
244+
<dependency>
245+
<groupId>org.datanucleus</groupId>
246+
<artifactId>datanucleus-maven-plugin</artifactId>
247+
<version>5.0.2</version>
248+
</dependency>
249+
<dependency>
250+
<groupId>com.h2database</groupId>
251+
<artifactId>h2</artifactId>
252+
<version>1.4.194</version>
253+
</dependency>
203254
</dependencies>
204255

205256
<properties>
@@ -227,4 +278,4 @@
227278
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
228279
</properties>
229280

230-
</project>
281+
</project>

core-java/src/main/java/com/baeldung/jdo/GuideToJDO.java renamed to libraries/src/main/java/com/baeldung/jdo/GuideToJDO.java

File renamed without changes.

core-java/src/main/java/com/baeldung/jdo/Product.java renamed to libraries/src/main/java/com/baeldung/jdo/Product.java

File renamed without changes.

core-java/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java renamed to libraries/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java

File renamed without changes.

0 commit comments

Comments
 (0)