Skip to content

Commit edbbe22

Browse files
shroffkshroffk
authored
moving javafx to jdk11 profile to enable jdk8 building (#65)
* moving javafx to jdk11 profile to enable jdk8 building * Update .travis.yml
1 parent 99e199e commit edbbe22

File tree

4 files changed

+132
-125
lines changed

4 files changed

+132
-125
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ language: java
44
matrix:
55
include:
66
- jdk: openjdk8
7-
before_install:
8-
- export MVN_OPT='--projects "!gpclient/gpclient-javafx"'
97
- jdk: openjdk11
108

119
env:

‎gpclient/gpclient-ca/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<dependency>
1414
<groupId>org.epics</groupId>
1515
<artifactId>jca</artifactId>
16-
<version>2.4.3-SNAPSHOT</version>
17-
</dependency>
16+
</dependency>
1817
<dependency>
1918
<groupId>${project.groupId}</groupId>
2019
<artifactId>gpclient-core</artifactId>

‎gpclient/gpclient-pva/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
<dependency>
1515
<groupId>org.epics</groupId>
1616
<artifactId>epics-pvaccess</artifactId>
17-
<version>5.1.1</version>
18-
</dependency>
17+
</dependency>
1918
<dependency>
2019
<groupId>${project.groupId}</groupId>
2120
<artifactId>gpclient-core</artifactId>

‎gpclient/pom.xml‎

Lines changed: 130 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,132 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<artifactId>gpclient</artifactId>
5-
<name>gpclient</name>
6-
<parent>
7-
<groupId>org.epics</groupId>
8-
<artifactId>epics-parent</artifactId>
9-
<version>7.0.3-SNAPSHOT</version>
10-
</parent>
11-
<version>1.0.1-SNAPSHOT</version>
12-
<packaging>pom</packaging>
13-
<description>The generic purpose JAVA EPICS client.</description>
14-
<properties>
15-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
</properties>
17-
<modules>
18-
<module>gpclient-core</module>
19-
<module>gpclient-sim</module>
20-
<module>gpclient-ca</module>
21-
<module>gpclient-pva</module>
22-
<module>gpclient-javafx</module>
23-
<module>gpclient-loc</module>
24-
<module>gpclient-sample</module>
25-
</modules>
26-
<build>
27-
<!-- Reset to standard source directories -->
28-
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
29-
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
30-
<plugins>
31-
<plugin>
32-
<groupId>org.apache.maven.plugins</groupId>
33-
<artifactId>maven-compiler-plugin</artifactId>
34-
<version>3.6.2</version>
35-
<configuration>
36-
<source>1.8</source>
37-
<target>1.8</target>
38-
</configuration>
39-
</plugin>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-source-plugin</artifactId>
43-
<version>3.0.1</version>
44-
<executions>
45-
<execution>
46-
<id>attach-sources</id>
47-
<goals>
48-
<goal>jar</goal>
49-
</goals>
50-
</execution>
51-
</executions>
52-
</plugin>
53-
<plugin>
54-
<groupId>org.apache.maven.plugins</groupId>
55-
<artifactId>maven-javadoc-plugin</artifactId>
56-
<version>2.10.4</version>
57-
<executions>
58-
<execution>
59-
<id>attach-javadocs</id>
60-
<goals>
61-
<goal>jar</goal>
62-
</goals>
63-
</execution>
64-
</executions>
65-
</plugin>
66-
<plugin>
67-
<groupId>com.mycila</groupId>
68-
<artifactId>license-maven-plugin</artifactId>
69-
<version>3.0</version>
70-
<configuration>
71-
<header>HEADER.TXT</header>
72-
<includes>
73-
<include>**/*.java</include>
74-
</includes>
75-
</configuration>
76-
</plugin>
77-
</plugins>
78-
</build>
79-
<reporting>
80-
<plugins>
81-
<plugin>
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-javadoc-plugin</artifactId>
84-
<version>3.0.0</version>
85-
<reportSets>
86-
<reportSet>
87-
<id>aggregate</id>
88-
<reports>
89-
<report>aggregate</report>
90-
</reports>
91-
</reportSet>
92-
</reportSets>
93-
</plugin>
94-
</plugins>
95-
</reporting>
96-
<dependencies>
97-
<dependency>
98-
<groupId>${project.groupId}</groupId>
99-
<artifactId>epics-util</artifactId>
100-
<version>${project.version}</version>
101-
</dependency>
102-
<dependency>
103-
<groupId>junit</groupId>
104-
<artifactId>junit</artifactId>
105-
<version>4.12</version>
106-
<scope>test</scope>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.mockito</groupId>
110-
<artifactId>mockito-core</artifactId>
111-
<version>2.22.0</version>
112-
<scope>test</scope>
113-
</dependency>
114-
<dependency>
115-
<groupId>org.hamcrest</groupId>
116-
<artifactId>hamcrest-all</artifactId>
117-
<version>1.3</version>
118-
<scope>test</scope>
119-
</dependency>
120-
</dependencies>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<artifactId>gpclient</artifactId>
7+
<name>gpclient</name>
8+
<parent>
9+
<groupId>org.epics</groupId>
10+
<artifactId>epics-parent</artifactId>
11+
<version>7.0.3-SNAPSHOT</version>
12+
</parent>
13+
<version>1.0.1-SNAPSHOT</version>
14+
<packaging>pom</packaging>
15+
<description>The generic purpose JAVA EPICS client.</description>
16+
<properties>
17+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
</properties>
19+
<modules>
20+
<module>gpclient-core</module>
21+
<module>gpclient-sim</module>
22+
<module>gpclient-ca</module>
23+
<module>gpclient-pva</module>
24+
<module>gpclient-loc</module>
25+
<module>gpclient-sample</module>
26+
</modules>
27+
<build>
28+
<!-- Reset to standard source directories -->
29+
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
30+
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-compiler-plugin</artifactId>
35+
<version>3.6.2</version>
36+
<configuration>
37+
<source>1.8</source>
38+
<target>1.8</target>
39+
</configuration>
40+
</plugin>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-source-plugin</artifactId>
44+
<version>3.0.1</version>
45+
<executions>
46+
<execution>
47+
<id>attach-sources</id>
48+
<goals>
49+
<goal>jar</goal>
50+
</goals>
51+
</execution>
52+
</executions>
53+
</plugin>
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-javadoc-plugin</artifactId>
57+
<version>2.10.4</version>
58+
<executions>
59+
<execution>
60+
<id>attach-javadocs</id>
61+
<goals>
62+
<goal>jar</goal>
63+
</goals>
64+
</execution>
65+
</executions>
66+
</plugin>
67+
<plugin>
68+
<groupId>com.mycila</groupId>
69+
<artifactId>license-maven-plugin</artifactId>
70+
<version>3.0</version>
71+
<configuration>
72+
<header>HEADER.TXT</header>
73+
<includes>
74+
<include>**/*.java</include>
75+
</includes>
76+
</configuration>
77+
</plugin>
78+
</plugins>
79+
</build>
80+
<reporting>
81+
<plugins>
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-javadoc-plugin</artifactId>
85+
<version>3.0.0</version>
86+
<reportSets>
87+
<reportSet>
88+
<id>aggregate</id>
89+
<reports>
90+
<report>aggregate</report>
91+
</reports>
92+
</reportSet>
93+
</reportSets>
94+
</plugin>
95+
</plugins>
96+
</reporting>
97+
<dependencies>
98+
<dependency>
99+
<groupId>${project.groupId}</groupId>
100+
<artifactId>epics-util</artifactId>
101+
<version>${project.version}</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>junit</groupId>
105+
<artifactId>junit</artifactId>
106+
<version>4.12</version>
107+
<scope>test</scope>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.mockito</groupId>
111+
<artifactId>mockito-core</artifactId>
112+
<version>2.22.0</version>
113+
<scope>test</scope>
114+
</dependency>
115+
<dependency>
116+
<groupId>org.hamcrest</groupId>
117+
<artifactId>hamcrest-all</artifactId>
118+
<version>1.3</version>
119+
<scope>test</scope>
120+
</dependency>
121+
</dependencies>
122+
<profiles>
123+
<profile>
124+
<activation>
125+
<jdk>[1.11,)</jdk>
126+
</activation>
127+
<modules>
128+
<module>gpclient-javafx</module>
129+
</modules>
130+
</profile>
131+
</profiles>
121132
</project>

0 commit comments

Comments
 (0)