Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion cics-java-liberty-restapp-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ plugins
group = 'com.ibm.cicsdev.restapp'
archivesBaseName='cics-java-liberty-restapp'
version = '0.1.0'
sourceCompatibility = '1.8'

java {
toolchain {
languageVersion = JavaLanguageVersion.of(java_version)
}
}

// If in Eclipse, add Javadoc to the local project classpath
eclipse
Expand Down
9 changes: 8 additions & 1 deletion cics-java-liberty-restapp-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@

<build>
<plugins>
<!-- Maven Compiler Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
</plugin>

<!-- WAR plugin build-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -53,7 +60,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</archive>
</configuration>
</plugin>

Expand Down
10 changes: 10 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
java_version = 8

# Gradle daemon improves build performance
org.gradle.daemon=true

# Enable parallel builds for faster compilation
org.gradle.parallel=true

# Configuration cache disabled - CICS Bundle Plugin 1.0.8 not compatible
# org.gradle.configuration-cache=true
24 changes: 18 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@


<properties>
<java.version>1.8</java.version>
<java.version>8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
Expand All @@ -41,10 +41,22 @@


<modules>
<module>cics-java-liberty-restapp-app</module>
<module>cics-java-liberty-restapp-bundle</module>
</modules>


<module>cics-java-liberty-restapp-app</module>
<module>cics-java-liberty-restapp-bundle</module>
</modules>

<!-- ================================================================ -->
<!-- Build Configuration -->
<!-- ================================================================ -->
<build>
<plugins>
<!-- Maven Compiler Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
</plugin>
</plugins>
</build>

</project>
7 changes: 7 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
// ============================================================================
// Root Project Configuration
// ============================================================================
rootProject.name = 'cics-java-liberty-restapp'

// ============================================================================
// Subprojects
// ============================================================================
include(':cics-java-liberty-restapp-app')
include(':cics-java-liberty-restapp-bundle')
Loading