Skip to content

Commit e24d3fa

Browse files
lukasjlukasj
committed
update samples,
remove obsolete profiles Signed-off-by: Lukas Jungmann <[email protected]>
1 parent 68293e8 commit e24d3fa

File tree

11 files changed

+256
-440
lines changed

11 files changed

+256
-440
lines changed

‎demos/customprovider-jdk9/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@
6565
--module-path ${project.build.directory}/classes:${mod.dir}:${project.build.directory}/test-classes
6666
--add-modules org.glassfish.jakarta.json.demos.customprovider
6767
</argLine>
68-
<!--
69-
- -add-modules org.glassfish.jakarta.json.demos.customprovider,org.glassfish.jakarta.json,junit
70-
- -patch-module org.glassfish.jakarta.json.demos.customprovider=${project.build.directory}/test-classes
71-
-->
7268
</configuration>
7369
</plugin>
7470
</plugins>
@@ -86,7 +82,6 @@
8682
<dependency>
8783
<groupId>org.hamcrest</groupId>
8884
<artifactId>hamcrest-core</artifactId>
89-
<version>1.3</version>
9085
<scope>test</scope>
9186
</dependency>
9287
</dependencies>

‎demos/customprovider-jdk9/src/main/jdk9/module-info.java renamed to ‎demos/customprovider-jdk9/src/main/java/module-info.java

File renamed without changes.

‎demos/facebook/pom.xml

Lines changed: 66 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -26,132 +26,76 @@
2626

2727
<properties>
2828
<main.class>org.glassfish.jsondemos.facebook.FacebookObjectSearch</main.class>
29+
<!--
30+
<main.class>org.glassfish.jsondemos.facebook.FacebookStreamSearch</main.class>
31+
-->
32+
<modules.directory>${project.build.directory}/modules</modules.directory>
2933
</properties>
3034

31-
<profiles>
32-
<profile>
33-
<id>all</id>
34-
<activation>
35-
<activeByDefault>true</activeByDefault>
36-
</activation>
37-
<dependencies>
38-
<dependency>
39-
<groupId>jakarta.json</groupId>
40-
<artifactId>jakarta.json-api</artifactId>
41-
<scope>compile</scope>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.glassfish</groupId>
45-
<artifactId>jakarta.json</artifactId>
46-
<scope>runtime</scope>
47-
</dependency>
48-
</dependencies>
49-
<build>
50-
<plugins>
51-
<plugin>
52-
<groupId>org.codehaus.mojo</groupId>
53-
<artifactId>exec-maven-plugin</artifactId>
54-
<executions>
55-
<execution>
56-
<id>example-facebook-jdk8</id>
57-
<goals>
58-
<goal>java</goal>
59-
</goals>
60-
</execution>
61-
</executions>
62-
<configuration>
63-
<mainClass>${main.class}</mainClass>
64-
</configuration>
65-
</plugin>
66-
</plugins>
67-
</build>
68-
</profile>
35+
<dependencies>
36+
<dependency>
37+
<groupId>org.glassfish</groupId>
38+
<artifactId>jakarta.json</artifactId>
39+
</dependency>
40+
</dependencies>
6941

70-
<profile>
71-
<id>jdk9-setup</id>
72-
<activation>
73-
<jdk>[9,)</jdk>
74-
</activation>
75-
<dependencies>
76-
<dependency>
77-
<groupId>jakarta.json</groupId>
78-
<artifactId>jakarta.json-api</artifactId>
79-
<scope>compile</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.glassfish</groupId>
83-
<artifactId>jakarta.json</artifactId>
84-
<classifier>module</classifier>
85-
<scope>compile</scope>
86-
</dependency>
87-
</dependencies>
88-
<properties>
89-
<modules.directory>${project.build.directory}/modules</modules.directory>
90-
</properties>
91-
<build>
92-
<plugins>
93-
<plugin>
94-
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-dependency-plugin</artifactId>
96-
<configuration>
97-
<stripVersion>true</stripVersion>
98-
<outputDirectory>${modules.directory}</outputDirectory>
99-
</configuration>
100-
<executions>
101-
<execution>
102-
<id>get-dependencies</id>
103-
<phase>package</phase>
104-
<goals>
105-
<goal>copy-dependencies</goal>
106-
</goals>
107-
<configuration>
108-
<includeArtifactIds>jakarta.json</includeArtifactIds>
109-
</configuration>
110-
</execution>
111-
<execution>
112-
<id>get-project-artifact</id>
113-
<phase>package</phase>
114-
<goals>
115-
<goal>copy</goal>
116-
</goals>
117-
<configuration>
118-
<artifactItems>
119-
<artifactItem>
120-
<groupId>${project.groupId}</groupId>
121-
<artifactId>${project.artifactId}</artifactId>
122-
<version>${project.version}</version>
123-
</artifactItem>
124-
</artifactItems>
125-
</configuration>
126-
</execution>
127-
</executions>
128-
</plugin>
129-
<plugin>
130-
<groupId>org.codehaus.mojo</groupId>
131-
<artifactId>exec-maven-plugin</artifactId>
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-dependency-plugin</artifactId>
47+
<configuration>
48+
<stripVersion>true</stripVersion>
49+
<outputDirectory>${modules.directory}</outputDirectory>
50+
</configuration>
51+
<executions>
52+
<execution>
53+
<id>get-dependencies</id>
54+
<phase>package</phase>
55+
<goals>
56+
<goal>copy-dependencies</goal>
57+
</goals>
58+
</execution>
59+
<execution>
60+
<id>get-project-artifact</id>
61+
<phase>package</phase>
62+
<goals>
63+
<goal>copy</goal>
64+
</goals>
13265
<configuration>
133-
<executable>java</executable>
134-
<arguments>
135-
<argument>--add-modules</argument>
136-
<argument>org.glassfish.jakarta.json</argument>
137-
<argument>--module-path</argument>
138-
<argument>${modules.directory}</argument>
139-
<argument>-m</argument>
140-
<argument>org.glassfish.jakarta.json.demos.facebook/${main.class}</argument>
141-
</arguments>
66+
<artifactItems>
67+
<artifactItem>
68+
<groupId>${project.groupId}</groupId>
69+
<artifactId>${project.artifactId}</artifactId>
70+
<version>${project.version}</version>
71+
</artifactItem>
72+
</artifactItems>
14273
</configuration>
143-
<executions>
144-
<execution>
145-
<id>example-facebook-jdk9</id>
146-
<goals>
147-
<goal>exec</goal>
148-
</goals>
149-
</execution>
150-
</executions>
151-
</plugin>
152-
</plugins>
153-
</build>
154-
</profile>
155-
</profiles>
74+
</execution>
75+
</executions>
76+
</plugin>
77+
<plugin>
78+
<groupId>org.codehaus.mojo</groupId>
79+
<artifactId>exec-maven-plugin</artifactId>
80+
<configuration>
81+
<executable>java</executable>
82+
<arguments>
83+
<argument>--module-path</argument>
84+
<argument>${modules.directory}</argument>
85+
<argument>-m</argument>
86+
<argument>org.glassfish.jakarta.json.demos.facebook/${main.class}</argument>
87+
</arguments>
88+
</configuration>
89+
<executions>
90+
<execution>
91+
<id>example-facebook</id>
92+
<goals>
93+
<goal>exec</goal>
94+
</goals>
95+
</execution>
96+
</executions>
97+
</plugin>
98+
</plugins>
99+
</build>
156100

157101
</project>

‎demos/facebook/src/main/jdk9/module-info.java renamed to ‎demos/facebook/src/main/java/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
*/
1010

1111
module org.glassfish.jakarta.json.demos.facebook {
12-
requires org.glassfish.jakarta.json;
12+
requires jakarta.json;
1313
}

0 commit comments

Comments
 (0)