From da4b0dc351d9387a4cd4e281ec659bc531824702 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Sun, 6 Jun 2021 20:24:22 -0700 Subject: [PATCH] LPS-132587 prep next --- .../artifact.properties | 8 +- .../artifact.properties | 12 +- .../README.markdown | 4 +- .../gradle-plugins-service-builder/bnd.bnd | 2 +- .../build.gradle | 2 +- .../build.gradle | 4 +- modules/sdk/gradle-plugins/build.gradle | 2 +- .../dependencies/portal-tools.properties | 2 +- .../util/portal-tools-service-builder/bnd.bnd | 2 +- .../samples/pom.xml | 2 +- .../plugin-help.xml | 2 +- .../pom.properties | 3 - .../pom.xml | 190 ------------------ .../main/resources/META-INF/maven/plugin.xml | 4 +- .../ivy.xml | 2 +- 15 files changed, 24 insertions(+), 217 deletions(-) delete mode 100644 modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/pom.properties delete mode 100644 modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/pom.xml diff --git a/modules/.releng/sdk/gradle-plugins-service-builder/artifact.properties b/modules/.releng/sdk/gradle-plugins-service-builder/artifact.properties index 09c9e7ef271bf4..48a69dfa8466f1 100644 --- a/modules/.releng/sdk/gradle-plugins-service-builder/artifact.properties +++ b/modules/.releng/sdk/gradle-plugins-service-builder/artifact.properties @@ -1,4 +1,4 @@ -artifact.git.id=c3634e8f72cc4b7b0bafac3510a2f9c45c2cb575 -artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.service.builder/4.0.56/com.liferay.gradle.plugins.service.builder-4.0.56-javadoc.jar -artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.service.builder/4.0.56/com.liferay.gradle.plugins.service.builder-4.0.56-sources.jar -artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.service.builder/4.0.56/com.liferay.gradle.plugins.service.builder-4.0.56.jar \ No newline at end of file +artifact.git.id=ce09ad28b617c2831ac851a9f5fe7d2bdcc5d6e1 +artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.service.builder/4.0.57/com.liferay.gradle.plugins.service.builder-4.0.57-javadoc.jar +artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.service.builder/4.0.57/com.liferay.gradle.plugins.service.builder-4.0.57-sources.jar +artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.service.builder/4.0.57/com.liferay.gradle.plugins.service.builder-4.0.57.jar \ No newline at end of file diff --git a/modules/.releng/util/portal-tools-service-builder/artifact.properties b/modules/.releng/util/portal-tools-service-builder/artifact.properties index bb427be1f109db..b13c830c23e5ae 100644 --- a/modules/.releng/util/portal-tools-service-builder/artifact.properties +++ b/modules/.releng/util/portal-tools-service-builder/artifact.properties @@ -1,6 +1,6 @@ -artifact.git.id=c3634e8f72cc4b7b0bafac3510a2f9c45c2cb575 -artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.service.builder/1.0.385/com.liferay.portal.tools.service.builder-1.0.385-sources-commercial.jar -artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.service.builder/1.0.385/com.liferay.portal.tools.service.builder-1.0.385-sources.jar -artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.service.builder/1.0.385/com.liferay.portal.tools.service.builder-1.0.385.tar -artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.service.builder/1.0.385/com.liferay.portal.tools.service.builder-1.0.385.jar -artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.service.builder/1.0.385/com.liferay.portal.tools.service.builder-1.0.385.zip \ No newline at end of file +artifact.git.id=ce09ad28b617c2831ac851a9f5fe7d2bdcc5d6e1 +artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.service.builder/1.0.386/com.liferay.portal.tools.service.builder-1.0.386-sources-commercial.jar +artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.service.builder/1.0.386/com.liferay.portal.tools.service.builder-1.0.386-sources.jar +artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.service.builder/1.0.386/com.liferay.portal.tools.service.builder-1.0.386.tar +artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.service.builder/1.0.386/com.liferay.portal.tools.service.builder-1.0.386.jar +artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.service.builder/1.0.386/com.liferay.portal.tools.service.builder-1.0.386.zip \ No newline at end of file diff --git a/modules/sdk/gradle-plugins-service-builder/README.markdown b/modules/sdk/gradle-plugins-service-builder/README.markdown index b4002bcde6fee1..370fa69da7db30 100644 --- a/modules/sdk/gradle-plugins-service-builder/README.markdown +++ b/modules/sdk/gradle-plugins-service-builder/README.markdown @@ -13,7 +13,7 @@ To use the plugin, include it in your build script: ```gradle buildscript { dependencies { - classpath group: "com.liferay", name: "com.liferay.gradle.plugins.service.builder", version: "4.0.56" + classpath group: "com.liferay", name: "com.liferay.gradle.plugins.service.builder", version: "4.0.57" } repositories { @@ -148,7 +148,7 @@ manually adding a dependency to the `serviceBuilder` configuration: ```gradle dependencies { - serviceBuilder group: "com.liferay", name: "com.liferay.portal.tools.service.builder", version: "1.0.385" + serviceBuilder group: "com.liferay", name: "com.liferay.portal.tools.service.builder", version: "1.0.386" } ``` diff --git a/modules/sdk/gradle-plugins-service-builder/bnd.bnd b/modules/sdk/gradle-plugins-service-builder/bnd.bnd index 8aa0d4df1e96bd..ba6410cf1d5f08 100644 --- a/modules/sdk/gradle-plugins-service-builder/bnd.bnd +++ b/modules/sdk/gradle-plugins-service-builder/bnd.bnd @@ -1,6 +1,6 @@ Bundle-Description: The Service Builder Gradle plugin lets you generate a Liferay service layer defined in a Service Builder service.xml file. Bundle-Name: Liferay Gradle Plugins Service Builder Bundle-SymbolicName: com.liferay.gradle.plugins.service.builder -Bundle-Version: 4.0.57 +Bundle-Version: 4.0.58 Export-Package: com.liferay.gradle.plugins.service.builder -includeresource: @com.liferay.portal.tools.service.builder-*.jar!/com/liferay/portal/tools/service/builder/ServiceBuilderArgs.class \ No newline at end of file diff --git a/modules/sdk/gradle-plugins-service-builder/build.gradle b/modules/sdk/gradle-plugins-service-builder/build.gradle index d51acd8addf288..27a77997eea8dc 100644 --- a/modules/sdk/gradle-plugins-service-builder/build.gradle +++ b/modules/sdk/gradle-plugins-service-builder/build.gradle @@ -18,7 +18,7 @@ dependencies { compile group: "com.liferay", name: "com.liferay.gradle.util", version: "1.0.44" compileOnly fileTree(builtBy: [rootProject.tasks.getByName("extractGradleApi" + gradleVersion.replace(".", ""))], dir: new File(rootProject.buildDir, "gradle-${gradleVersion}")) - compileOnly group: "com.liferay", name: "com.liferay.portal.tools.service.builder", version: "1.0.385" + compileOnly group: "com.liferay", name: "com.liferay.portal.tools.service.builder", version: "1.0.386" } gradleTest { diff --git a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformCustomConfigurations/build.gradle b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformCustomConfigurations/build.gradle index 33abf896a31518..5d3bdd94b26a18 100644 --- a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformCustomConfigurations/build.gradle +++ b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformCustomConfigurations/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath group: "com.liferay", name: "com.liferay.gradle.plugins.service.builder", version: "4.0.56" + classpath group: "com.liferay", name: "com.liferay.gradle.plugins.service.builder", version: "4.0.57" } repositories { @@ -31,7 +31,7 @@ apply plugin: "java" task runGradleTest dependencies { - serviceBuilder group: "com.liferay", name: "com.liferay.portal.tools.service.builder", version: "1.0.385" + serviceBuilder group: "com.liferay", name: "com.liferay.portal.tools.service.builder", version: "1.0.386" targetPlatformBoms group: "com.liferay.portal", name: "release.portal.bom", version: "7.2.1" } diff --git a/modules/sdk/gradle-plugins/build.gradle b/modules/sdk/gradle-plugins/build.gradle index 63671b9086029f..336cb2ef3ea037 100644 --- a/modules/sdk/gradle-plugins/build.gradle +++ b/modules/sdk/gradle-plugins/build.gradle @@ -51,7 +51,7 @@ dependencies { compile group: "com.liferay", name: "com.liferay.gradle.plugins.node", version: "7.2.7" compile group: "com.liferay", name: "com.liferay.gradle.plugins.python", version: "1.0.1" compile group: "com.liferay", name: "com.liferay.gradle.plugins.rest.builder", version: "1.1.59" - compile group: "com.liferay", name: "com.liferay.gradle.plugins.service.builder", version: "4.0.56" + compile group: "com.liferay", name: "com.liferay.gradle.plugins.service.builder", version: "4.0.57" compile group: "com.liferay", name: "com.liferay.gradle.plugins.source.formatter", version: "5.1.19" compile group: "com.liferay", name: "com.liferay.gradle.plugins.test.integration", version: "3.0.5" compile group: "com.liferay", name: "com.liferay.gradle.plugins.tld.formatter", version: "1.0.11" diff --git a/modules/sdk/gradle-plugins/src/main/resources/com/liferay/gradle/plugins/dependencies/portal-tools.properties b/modules/sdk/gradle-plugins/src/main/resources/com/liferay/gradle/plugins/dependencies/portal-tools.properties index 958b42996e9a53..0695809a568c59 100644 --- a/modules/sdk/gradle-plugins/src/main/resources/com/liferay/gradle/plugins/dependencies/portal-tools.properties +++ b/modules/sdk/gradle-plugins/src/main/resources/com/liferay/gradle/plugins/dependencies/portal-tools.properties @@ -7,7 +7,7 @@ com.liferay.lang.builder=1.0.42 com.liferay.pmd=1.0.1 com.liferay.portal.tools.db.support=1.0.8 com.liferay.portal.tools.rest.builder=1.0.182 -com.liferay.portal.tools.service.builder=1.0.385 +com.liferay.portal.tools.service.builder=1.0.386 com.liferay.portal.tools.upgrade.table.builder=1.0.10 com.liferay.portal.tools.wsdd.builder=1.0.11 com.liferay.source.formatter=1.0.1120 diff --git a/modules/util/portal-tools-service-builder/bnd.bnd b/modules/util/portal-tools-service-builder/bnd.bnd index 6fee041eefb454..537a2423c656e4 100644 --- a/modules/util/portal-tools-service-builder/bnd.bnd +++ b/modules/util/portal-tools-service-builder/bnd.bnd @@ -1,6 +1,6 @@ Bundle-Name: Liferay Portal Tools Service Builder Bundle-SymbolicName: com.liferay.portal.tools.service.builder -Bundle-Version: 1.0.386 +Bundle-Version: 1.0.387 Import-Package:\ !javax.portlet.*,\ \ diff --git a/modules/util/portal-tools-service-builder/samples/pom.xml b/modules/util/portal-tools-service-builder/samples/pom.xml index 8242c23be9c0ad..fe3b6054c61926 100644 --- a/modules/util/portal-tools-service-builder/samples/pom.xml +++ b/modules/util/portal-tools-service-builder/samples/pom.xml @@ -16,7 +16,7 @@ com.liferay com.liferay.portal.tools.service.builder - 1.0.385 + 1.0.386 ../tmp/api com.liferay.util.bean.PortletBeanLocatorUtil diff --git a/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/plugin-help.xml b/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/plugin-help.xml index 7379193c8d46f3..7cc19ee4f727ac 100644 --- a/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/plugin-help.xml +++ b/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/plugin-help.xml @@ -7,7 +7,7 @@ com.liferay com.liferay.portal.tools.service.builder - 1.0.385 + 1.0.386 service-builder diff --git a/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/pom.properties b/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/pom.properties deleted file mode 100644 index 3fcf1f245a335b..00000000000000 --- a/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=com.liferay.portal.tools.service.builder -groupId=com.liferay -version=1.0.376 \ No newline at end of file diff --git a/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/pom.xml b/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/pom.xml deleted file mode 100644 index 8fef68b7ba7c2b..00000000000000 --- a/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/com.liferay/com.liferay.portal.tools.service.builder/pom.xml +++ /dev/null @@ -1,190 +0,0 @@ - - - - 4.0.0 - com.liferay - com.liferay.portal.tools.service.builder - 1.0.376 - - - com.puppycrawl.tools - checkstyle - 8.26 - compile - - - com.thoughtworks.qdox - qdox - 2.0-M5 - compile - - - commons-io - commons-io - 2.5 - compile - - - jalopy - jalopy - 1.5rc3 - compile - - - * - * - - - - - jaxen - jaxen - 1.1.1 - compile - - - * - * - - - - - log4j - log4j - 1.2.17 - compile - - - org.dom4j - dom4j - 2.1.3 - compile - - - * - * - - - - - org.freemarker - freemarker - 2.3.23 - compile - - - * - * - - - - - com.liferay - com.liferay.petra.concurrent - 1.1.0 - provided - - - com.liferay - com.liferay.petra.io - 4.0.2 - provided - - - com.liferay - com.liferay.petra.lang - 1.0.0 - provided - - - com.liferay - com.liferay.petra.memory - 1.0.0 - provided - - - com.liferay - com.liferay.petra.reflect - 1.1.0 - provided - - - com.liferay - com.liferay.petra.sql.dsl.api - 1.0.0 - provided - - - com.liferay - com.liferay.petra.string - 4.0.0 - provided - - - com.liferay - com.liferay.petra.xml - 1.0.0 - provided - - - com.liferay - com.liferay.portal.tools.java.parser - 1.0.34 - provided - - - com.liferay.portal - com.liferay.portal.impl - 2.71.9 - provided - - - com.liferay.portal - com.liferay.portal.kernel - default - provided - - - com.liferay.portal - com.liferay.util.java - 2.5.0 - provided - - - org.apache.ant - ant - 1.9.15 - provided - - - * - * - - - - - org.apache.maven - maven-plugin-api - 3.0.4 - provided - - - * - * - - - - - xerces - xercesImpl - 2.12.0 - provided - - - * - * - - - - - \ No newline at end of file diff --git a/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/plugin.xml b/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/plugin.xml index d8985dd449c6b4..33b3e44f6b054e 100644 --- a/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/plugin.xml +++ b/modules/util/portal-tools-service-builder/src/main/resources/META-INF/maven/plugin.xml @@ -7,7 +7,7 @@ com.liferay com.liferay.portal.tools.service.builder - 1.0.385 + 1.0.386 service-builder false true @@ -351,7 +351,7 @@ commons-io commons-io jar - 2.5 + 2.8.0 jalopy diff --git a/tools/sdk/dependencies/com.liferay.portal.tools.service.builder/ivy.xml b/tools/sdk/dependencies/com.liferay.portal.tools.service.builder/ivy.xml index b7dbae959cd90c..76ab69e17746ea 100644 --- a/tools/sdk/dependencies/com.liferay.portal.tools.service.builder/ivy.xml +++ b/tools/sdk/dependencies/com.liferay.portal.tools.service.builder/ivy.xml @@ -12,6 +12,6 @@ - + \ No newline at end of file