Skip to content

Commit 7b9ad86

Browse files
committed
gradle build
1 parent d686a00 commit 7b9ad86

15 files changed

+69
-32
lines changed

.project

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
</projects>
77
<buildSpec>
88
<buildCommand>
9-
<name>org.eclipse.jdt.core.javabuilder</name>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.wst.common.project.facet.core.builder</name>
14+
<name>org.eclipse.jdt.core.javabuilder</name>
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
1818
<buildCommand>
19-
<name>org.eclipse.wst.validation.validationbuilder</name>
19+
<name>org.eclipse.wst.common.project.facet.core.builder</name>
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
2323
<buildCommand>
24-
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
24+
<name>org.eclipse.wst.validation.validationbuilder</name>
2525
<arguments>
2626
</arguments>
2727
</buildCommand>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=cics-java-liberty-restapp-app
2+
eclipse.preferences.version=1
Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src/main/java"/>
4-
<classpathentry kind="con" path="com.ibm.cics.explorer.sdk.web.LIBERTY_LIBRARIES/L./V.55/JE.7"/>
3+
<classpathentry kind="src" output="bin/main" path="src/main/java">
4+
<attributes>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
7+
</attributes>
8+
</classpathentry>
59
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
10+
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
11+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
12+
<attributes>
13+
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
14+
</attributes>
15+
</classpathentry>
616
<classpathentry kind="src" path=".apt_generated">
717
<attributes>
818
<attribute name="optional" value="true"/>
919
</attributes>
1020
</classpathentry>
11-
<classpathentry kind="output" path="bin/"/>
12-
</classpath>
21+
<classpathentry kind="output" path="bin/default"/>
22+
</classpath>

cics-java-liberty-restapp-app/.project

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
</projects>
77
<buildSpec>
88
<buildCommand>
9-
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.jdt.core.javabuilder</name>
14+
<name>org.eclipse.wst.common.project.facet.core.builder</name>
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
1818
<buildCommand>
19-
<name>org.eclipse.wst.common.project.facet.core.builder</name>
19+
<name>org.eclipse.wst.validation.validationbuilder</name>
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
2323
<buildCommand>
24-
<name>org.eclipse.wst.validation.validationbuilder</name>
24+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
2525
<arguments>
2626
</arguments>
2727
</buildCommand>

cics-java-liberty-restapp-app/.settings/org.eclipse.buildship.core.prefs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ arguments=
22
auto.sync=false
33
build.scans.enabled=false
44
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
5-
connection.project.dir=
5+
connection.project.dir=..
66
eclipse.preferences.version=1
77
gradle.user.home=
88
java.home=
99
jvm.arguments=
1010
offline.mode=false
1111
override.workspace.settings=false
1212
show.console.view=false
13-
show.executions.view=false
13+
show.executions.view=false
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
eclipse.preferences.version=1
2-
org.eclipse.jdt.apt.aptEnabled=true
2+
org.eclipse.jdt.apt.aptEnabled=false

cics-java-liberty-restapp-app/.settings/org.eclipse.jdt.core.prefs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1111
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1212
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1313
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
14-
org.eclipse.jdt.core.compiler.processAnnotations=enabled
14+
org.eclipse.jdt.core.compiler.processAnnotations=disabled
1515
org.eclipse.jdt.core.compiler.release=disabled
16-
org.eclipse.jdt.core.compiler.source=1.8
16+
org.eclipse.jdt.core.compiler.source=1.8
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<root>
2+
<facet id="jst.jaxrs">
3+
<node name="libprov">
4+
<attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
5+
</node>
6+
</facet>
7+
</root>

cics-java-liberty-restapp-app/.settings/org.eclipse.wst.common.project.facet.core.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<faceted-project>
33
<installed facet="jst.web" version="5.0"/>
44
<installed facet="java" version="1.8"/>
5-
</faceted-project>
5+
<installed facet="jst.jaxrs" version="2.0"/>
6+
</faceted-project>

build.gradle renamed to cics-java-liberty-restapp-app/build.gradle

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins
22
{
3-
id 'java'
4-
id 'eclipse'
5-
id 'idea'
6-
id 'war'
7-
id 'com.ibm.cics.bundle' version '1.0.6'
3+
id 'java'
4+
id 'eclipse'
5+
id 'idea'
6+
id 'war'
7+
88
}
99

1010
group = 'com.ibm.cicsdev.restapp'
@@ -40,17 +40,10 @@ dependencies
4040
// https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api
4141
compileOnly ("javax.ws.rs:javax.ws.rs-api:2.0")
4242

43-
// Add the files from the war task as CICS bundle parts
44-
cicsBundlePart files(war)
43+
4544

4645
//JAXB required if compiling with Java 11 or later
4746
compileOnly ("javax.xml.bind:jaxb-api:2.3.1")
4847
}
4948

5049

51-
// CICS bundle build, CICS bundle build, specify defaultJVMServer value to match CICS JVMSERVER name
52-
cicsBundle {
53-
build {
54-
defaultJVMServer = project.findProperty("cics.jvmserver") ?: "DFHWLP"
55-
}
56-
}

0 commit comments

Comments
 (0)