Răsfoiți Sursa

bugfix 编译失败

roo00 6 ani în urmă
părinte
comite
03193b1f19
3 a modificat fișierele cu 19 adăugiri și 5 ștergeri
  1. 1 2
      o2server/build_common.xml
  2. 16 1
      o2server/pom.xml
  3. 2 2
      o2server/x_base_core_project/pom.xml

+ 1 - 2
o2server/build_common.xml

@@ -96,7 +96,7 @@
 
 	<target name="createEnhancePersistenceXml">
 		<mkdir dir="${basedir}/src/main/resources/META-INF" />
-		<java classname="com.x.base.core.entity.tools.EnhancePersistenceXmlWriter" fork="true">
+		<java classname="com.x.base.core.entity.tools.EnhancePersistenceXmlWriter" fork="false">
 			<sysproperty key="file.encoding" value="utf-8" />
 			<classpath>
 				<pathelement path="${basedir}/target/classes" />
@@ -114,7 +114,6 @@
 					path:'${basedir}/src/main/resources/META-INF'
 				}" />
 		</java>
-		<sleep seconds="1" />
 	</target>
 
 </project>

+ 16 - 1
o2server/pom.xml

@@ -294,7 +294,7 @@
 		<dependency>
 			<groupId>io.github.classgraph</groupId>
 			<artifactId>classgraph</artifactId>
-			<version>4.6.18</version>
+			<version>4.8.4</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -544,6 +544,21 @@
 								<goal>run</goal>
 							</goals>
 						</execution>
+						<execution>
+							<id>createEnhancePersistenceXml_x_base_core_project</id>
+							<!-- <phase>generate-sources</phase> -->
+							<phase>none</phase>
+							<configuration>
+								<target>
+									<ant antfile="../build_common.xml">
+										<target name="createEnhancePersistenceXml_x_base_core_project" />
+									</ant>
+								</target>
+							</configuration>
+							<goals>
+								<goal>run</goal>
+							</goals>
+						</execution>
 						<execution>
 							<id>createEnhancePersistenceXml</id>
 							<!-- <phase>generate-sources</phase> -->

+ 2 - 2
o2server/x_base_core_project/pom.xml

@@ -24,7 +24,7 @@
 					</execution>
 					<execution>
 						<id>createEnhancePersistenceXml</id>
-						<phase>generate-resources</phase>
+						<phase>process-classes</phase>
 					</execution>
 				</executions>
 			</plugin>
@@ -34,7 +34,7 @@
 				<executions>
 					<execution>
 						<id>enhancer</id>
-						<phase>process-classes</phase>
+						<phase>prepare-package</phase>
 					</execution>
 				</executions>
 			</plugin>