Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fake gradle cache #345

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fake gradle cache #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
003296c
LPS-167821 Create patch to mvel2
seltong Nov 9, 2022
137bcc8
LPS-167821 Initial checkin
seltong Nov 28, 2022
dbefe5a
LPS-167821 Initial state
seltong Nov 28, 2022
0a79e98
LPS-167821 Apply fix Drools operate smoothly with Java 8
seltong Nov 28, 2022
8f34260
LPS-167821 Create patch file
seltong Nov 28, 2022
1ce9b48
LPS-167821 Apply patched library
seltong Nov 10, 2022
7e79cd5
LPS-171442 Make Opcodes.V1_6 the default option instead of the Opcode…
rafaprax Dec 19, 2022
c6d09d6
LPS-171442 Update usages
rafaprax Dec 19, 2022
cf95891
fake gradle cache
rafaprax Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added ...org.mvel2/2.1.0.drools16.LIFERAY-PATCHED-2/org.mvel2-2.1.0.drools16.LIFERAY-PATCHED-2.jar
View file
Open in desktop
Binary file not shown.
34 changes: 34 additions & 0 deletions ...org.mvel2/2.1.0.drools16.LIFERAY-PATCHED-2/org.mvel2-2.1.0.drools16.LIFERAY-PATCHED-2.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay</groupId>
<artifactId>org.mvel2</artifactId>
<version>2.1.0.drools16.LIFERAY-PATCHED-2</version>
<licenses>
<license>
<name>LGPL 2.1</name>
<url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
</license>
</licenses>
<developers>
<developer>
<name>Brian Wing Shun Chan</name>
<organization>Liferay, Inc.</organization>
<organizationUrl>http://www.liferay.com</organizationUrl>
</developer>
</developers>
<scm>
<connection>scm:git:[email protected]:liferay/liferay-portal.git</connection>
<developerConnection>scm:git:[email protected]:liferay/liferay-portal.git</developerConnection>
<url>http://github.com/liferay/liferay-portal</url>
</scm>
<dependencies>
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
<version>2.1.0.drools16</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion modules/dxp/apps/portal-rules-engine-drools/portal-rules-engine-drools/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies {
compileInclude group: "com.google.protobuf", name: "protobuf-java", version: "3.21.7"
compileInclude group: "com.liferay", name: "org.drools.core", version: "5.4.0.Final.LIFERAY-PATCHED-2"
compileInclude group: "com.liferay", name: "org.mvel2", version: "2.1.0.drools16.LIFERAY-PATCHED-2"
compileInclude group: "org.antlr", name: "antlr-runtime", version: "3.3"
compileInclude group: "org.drools", name: "drools-compiler", version: "5.4.0.Final"
compileInclude group: "org.drools", name: "knowledge-api", version: "5.4.0.Final"
compileInclude group: "org.drools", name: "knowledge-internal-api", version: "5.4.0.Final"
compileInclude group: "org.eclipse.jdt.core.compiler", name: "ecj", version: "4.5.1"
compileInclude group: "org.mvel", name: "mvel2", version: "2.1.0.drools16"

compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/third-party/org-drools-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ targetCompatibility = "1.6"

dependencies {
compile group: "com.google.protobuf", name: "protobuf-java", version: "2.4.1"
compile group: "com.liferay", name: "org.mvel2", version: "2.1.0.drools16.LIFERAY-PATCHED-2"
compile group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "3.0.0"
compile group: "com.thoughtworks.xstream", name: "xstream", version: "1.4.19"
compile group: "org.antlr", name: "antlr", version: "3.3"
compile group: "org.antlr", name: "antlr-runtime", version: "3.3"
compile group: "org.drools", name: "drools-core", optional, version: "5.4.0.Final"
compile group: "org.drools", name: "knowledge-api", version: "5.4.0.Final"
compile group: "org.drools", name: "knowledge-internal-api", version: "5.4.0.Final"
compile group: "org.mvel", name: "mvel2", version: "2.1.0.drools16"
}

patch {
Expand Down
2 changes: 2 additions & 0 deletions modules/third-party/org-mvel2/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Bundle-SymbolicName: org.mvel2
Bundle-Version: 2.1.0.drools16.LIFERAY-PATCHED-2
22 changes: 22 additions & 0 deletions modules/third-party/org-mvel2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import com.liferay.gradle.plugins.patcher.PatchTask

apply plugin: "com.liferay.patcher"

task patch(type: PatchTask)

sourceCompatibility = "1.6"
targetCompatibility = "1.6"

dependencies {
compile group: "org.mvel", name: "mvel2", version: "2.1.0.drools16"
}

patch {
ext {
autoClean = false
}

fileNames "org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java"

originalLibModuleName = "mvel2"
}
20 changes: 20 additions & 0 deletions modules/third-party/org-mvel2/patches/LPS-167821.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java b/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
index 1887c0b..e11c45e 100644
--- a/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
+++ b/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
@@ -85,7 +85,8 @@ public class ASMAccessorOptimizer extends AbstractOptimizer implements AccessorO
OPCODES_VERSION = Opcodes.V1_4;
else if (javaVersion.startsWith("1.5"))
OPCODES_VERSION = Opcodes.V1_5;
- else if (javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7"))
+ else if (javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7")
+ || javaVersion.startsWith("1.8"))
OPCODES_VERSION = Opcodes.V1_6;
else
OPCODES_VERSION = Opcodes.V1_2;
@@ -3275,3 +3276,4 @@ public class ASMAccessorOptimizer extends AbstractOptimizer implements AccessorO
return literal;
}
}
+/* @generated */
\ No newline at end of file
25 changes: 25 additions & 0 deletions modules/third-party/org-mvel2/patches/LPS-171442.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java b/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
index e11c45e84245..35e985316ee9 100644
--- a/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
+++ b/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
@@ -81,16 +81,13 @@ public class ASMAccessorOptimizer extends AbstractOptimizer implements AccessorO

static {
final String javaVersion = getProperty("java.version");
- if (javaVersion.startsWith("1.4"))
+ if (javaVersion.startsWith("1.4")) {
OPCODES_VERSION = Opcodes.V1_4;
- else if (javaVersion.startsWith("1.5"))
+ } else if (javaVersion.startsWith("1.5")) {
OPCODES_VERSION = Opcodes.V1_5;
- else if (javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7")
- || javaVersion.startsWith("1.8"))
+ } else {
OPCODES_VERSION = Opcodes.V1_6;
- else
- OPCODES_VERSION = Opcodes.V1_2;
-
+ }

String defaultNameSapce = getProperty("mvel2.namespace");
if (defaultNameSapce == null) NAMESPACE = "org/mvel2/";
Loading