Skip to content

Commit

Permalink
fix maven build bug
Browse files Browse the repository at this point in the history
  • Loading branch information
rocky committed Oct 10, 2022
1 parent 61f33a6 commit f09fd49
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 17 deletions.
2 changes: 1 addition & 1 deletion lattice-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>lattice-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lattice-remote/lattice-remote-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice-remote</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion lattice-remote/lattice-remote-container/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice-remote</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion lattice-remote/lattice-remote-runner/lattice-remote-runner-dubbo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice-remote-runner</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion lattice-remote/lattice-remote-runner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice-remote</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion lattice-remote/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion lattice-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 5 additions & 1 deletion lattice-runtime/src/main/java/org/hiforce/lattice/runtime/Lattice.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,16 @@ private void initLatticeClassLoader() {
Thread.currentThread().setContextClassLoader(latticeClassLoader);
}

public void reload() {
public final void clear(){
latticeRuntimeCache.clear();
registeredAbilities.clear();
TemplateRegister.getInstance().clear();
businessConfigs.clear();
initialized = false;
}

public void reload() {
clear();
start();
}

Expand Down
2 changes: 1 addition & 1 deletion lattice-tools/lattice-dynamic-loading/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice-tools</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion lattice-tools/lattice-load-config-res/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice-tools</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion lattice-tools/lattice-maven-build/lattice-maven-build-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice-maven-build</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion lattice-tools/lattice-maven-build/lattice-maven-build-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice-maven-build</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>maven-plugin</packaging>
Expand Down
4 changes: 3 additions & 1 deletion ...attice-maven-build-plugin/src/main/java/org/hiforce/lattice/maven/LatticeBuildPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.hiforce.lattice.runtime.Lattice;
import org.hiforce.lattice.utils.JacksonUtils;
import org.hiforce.lattice.maven.builder.*;
import org.hiforce.lattice.maven.model.LatticeInfo;
Expand Down Expand Up @@ -56,7 +57,8 @@ public class LatticeBuildPlugin extends AbstractMojo {


@Override
public void execute() throws MojoExecutionException, MojoFailureException {
public synchronized void execute() throws MojoExecutionException, MojoFailureException {
Lattice.getInstance().clear();

getLog().info(">> LatticeBuildPlugin start....");
getLog().info(">> Project: " + mavenProject.getName());
Expand Down
2 changes: 1 addition & 1 deletion lattice-tools/lattice-maven-build/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice-tools</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion lattice-tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lattice</artifactId>
<groupId>org.hiforce.lattice</groupId>
<version>1.0.10.1</version>
<version>1.0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<url>https://github.com/hiforce/lattice</url>
<inceptionYear>2022</inceptionYear>

<version>1.0.10.1</version>
<version>1.0.10.2</version>
<properties>
<version.lattice>1.0.10.1</version.lattice>
<version.lattice>1.0.10.2</version.lattice>
<version.spring>5.3.23</version.spring>
<version.spring.boot>2.7.4</version.spring.boot>
<springext-plugin-version>1.2</springext-plugin-version>
Expand Down

0 comments on commit f09fd49

Please sign in to comment.