You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2021/05/13 12:11:36 UTC
svn commit: r1889839 - in /poi/trunk: ./ poi-examples/ poi-excelant/
poi-ooxml-full/ poi-ooxml-lite-agent/ poi-ooxml-lite/ poi-ooxml/
poi-scratchpad/ poi/
Author: centic
Date: Thu May 13 12:11:35 2021
New Revision: 1889839
URL: http://svn.apache.org/viewvc?rev=1889839&view=rev
Log:
Start moving some bits to the main Gradle file
Use a common definition of some constants
Gradle plugins are in the main file already anyway
Modified:
poi/trunk/build.gradle
poi/trunk/poi-examples/build.gradle
poi/trunk/poi-excelant/build.gradle
poi/trunk/poi-ooxml-full/build.gradle
poi/trunk/poi-ooxml-lite-agent/build.gradle
poi/trunk/poi-ooxml-lite/build.gradle
poi/trunk/poi-ooxml/build.gradle
poi/trunk/poi-scratchpad/build.gradle
poi/trunk/poi/build.gradle
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1889839&r1=1889838&r2=1889839&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Thu May 13 12:11:35 2021
@@ -81,7 +81,7 @@ wrapper.finalizedBy adjustWrapperPropert
*/
allprojects {
// apply plugin: 'eclipse'
- apply plugin: 'idea'
+ apply plugin: 'idea'
}
/**
@@ -107,6 +107,12 @@ subprojects {
hamcrestVersion = '2.2'
xmlbeansVersion = '5.0.0'
batikVersion = '1.14'
+
+ JAVA9_SRC = 'src/main/java9'
+ JAVA9_OUT = "${buildDir}/classes/java9/main/"
+ TEST9_SRC = 'src/test/java9'
+ TEST9_OUT = "${buildDir}/classes/java9/test/"
+ VERSIONS9 = 'META-INF/versions/9'
}
tasks.withType(JavaCompile) {
Modified: poi/trunk/poi-examples/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-examples/build.gradle?rev=1889839&r1=1889838&r2=1889839&view=diff
==============================================================================
--- poi/trunk/poi-examples/build.gradle (original)
+++ poi/trunk/poi-examples/build.gradle Thu May 13 12:11:35 2021
@@ -17,16 +17,6 @@
import java.util.regex.Pattern
-plugins {
- id 'java'
- id 'maven-publish'
- id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
sourceSets {
main {
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
Modified: poi/trunk/poi-excelant/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-excelant/build.gradle?rev=1889839&r1=1889838&r2=1889839&view=diff
==============================================================================
--- poi/trunk/poi-excelant/build.gradle (original)
+++ poi/trunk/poi-excelant/build.gradle Thu May 13 12:11:35 2021
@@ -17,18 +17,6 @@
import java.util.regex.Pattern
-plugins {
- id 'java'
- id 'maven-publish'
- id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String TEST9_SRC = 'src/test/java9'
-final String TEST9_OUT = "${buildDir}/classes/java9/test/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
configurations {
tests
}
Modified: poi/trunk/poi-ooxml-full/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-full/build.gradle?rev=1889839&r1=1889838&r2=1889839&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-full/build.gradle (original)
+++ poi/trunk/poi-ooxml-full/build.gradle Thu May 13 12:11:35 2021
@@ -17,17 +17,7 @@ import java.util.regex.Pattern
limitations under the License.
==================================================================== */
-
-plugins {
- id 'java'
- id 'maven-publish'
- id 'java-library'
-}
-
final String MODULE_NAME = 'org.apache.poi.ooxml.schemas'
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String VERSIONS9 = 'META-INF/versions/9'
final String BEANS_SRC = "${buildDir}/generated-sources"
final String BEANS_RES = "${buildDir}/generated-resources"
Modified: poi/trunk/poi-ooxml-lite-agent/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite-agent/build.gradle?rev=1889839&r1=1889838&r2=1889839&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite-agent/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite-agent/build.gradle Thu May 13 12:11:35 2021
@@ -15,16 +15,6 @@
limitations under the License.
==================================================================== */
-plugins {
- id 'java'
- id 'maven-publish'
- id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
sourceSets {
main {
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
Modified: poi/trunk/poi-ooxml-lite/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite/build.gradle?rev=1889839&r1=1889838&r2=1889839&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite/build.gradle Thu May 13 12:11:35 2021
@@ -19,15 +19,6 @@ import java.util.stream.Collectors
limitations under the License.
==================================================================== */
-plugins {
- id 'java'
- id 'maven-publish'
- id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String VERSIONS9 = 'META-INF/versions/9'
final String BEANS_SRC = "${buildDir}/generated-sources"
final String BEANS_RES = "${buildDir}/generated-resources"
Modified: poi/trunk/poi-ooxml/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/build.gradle?rev=1889839&r1=1889838&r2=1889839&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/build.gradle (original)
+++ poi/trunk/poi-ooxml/build.gradle Thu May 13 12:11:35 2021
@@ -17,18 +17,6 @@
import java.util.regex.Pattern
-plugins {
- id 'java'
- id 'maven-publish'
- id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String TEST9_SRC = 'src/test/java9'
-final String TEST9_OUT = "${buildDir}/classes/java9/test/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
configurations {
all {
exclude group: 'xalan', module: 'xalan'
Modified: poi/trunk/poi-scratchpad/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/build.gradle?rev=1889839&r1=1889838&r2=1889839&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/build.gradle (original)
+++ poi/trunk/poi-scratchpad/build.gradle Thu May 13 12:11:35 2021
@@ -17,18 +17,6 @@ import java.util.regex.Pattern
limitations under the License.
==================================================================== */
-plugins {
- id 'java'
- id 'maven-publish'
- id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String TEST9_SRC = 'src/test/java9'
-final String TEST9_OUT = "${buildDir}/classes/java9/test/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
configurations {
tests
javadocs
Modified: poi/trunk/poi/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi/build.gradle?rev=1889839&r1=1889838&r2=1889839&view=diff
==============================================================================
--- poi/trunk/poi/build.gradle (original)
+++ poi/trunk/poi/build.gradle Thu May 13 12:11:35 2021
@@ -17,18 +17,6 @@
import java.util.regex.Pattern
-plugins {
- id 'java'
- id 'maven-publish'
- id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String TEST9_SRC = 'src/test/java9'
-final String TEST9_OUT = "${buildDir}/classes/java9/test/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
configurations {
tests
javadocs
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org