Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade svm, annotation for reflection #2070

Merged
merged 2 commits into from
Jun 19, 2020
Merged

Upgrade svm, annotation for reflection #2070

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a282077
Upgrade svm libraries.
tomas-langer Jun 19, 2020
415259e
Missed required class.
tomas-langer Jun 19, 2020
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
4 changes: 2 additions & 2 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<version.lib.failsafe>2.3.1</version.lib.failsafe>
<version.lib.google-api-client>1.30.5</version.lib.google-api-client>
<version.lib.google-error-prone>2.3.3</version.lib.google-error-prone>
<version.lib.graalvm>19.2.0</version.lib.graalvm>
<version.lib.graalvm>20.0.0</version.lib.graalvm>
<version.lib.grpc>1.27.1</version.lib.grpc>
<version.lib.guava>28.1-jre</version.lib.guava>
<version.lib.h2>1.4.199</version.lib.h2>
Expand Down Expand Up @@ -914,7 +914,7 @@
<version>${version.lib.graalvm}</version>
</dependency>
<dependency>
<groupId>com.oracle.substratevm</groupId>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${version.lib.graalvm}</version>
</dependency>
Expand Down
4 changes: 3 additions & 1 deletion examples/dbclient/pokemons/src/main/java/io/helidon/examples/dbclient/pokemons/Pokemon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
*/
package io.helidon.examples.dbclient.pokemons;

import io.helidon.common.Reflected;

/**
* POJO representing Pokemon.
*/
@Reflected
public class Pokemon {

private int id;
private String name;
private int idType;
Expand Down
4 changes: 2 additions & 2 deletions ...es/dbclient/pokemons/src/main/java/io/helidon/examples/dbclient/pokemons/PokemonMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
*/
public final class PokemonMain {

/** MongoDB configuration. Default configuration file {@code appliaction.yaml} contains MySQL/JDBC configuration. */
/** MongoDB configuration. Default configuration file {@code appliaction.yaml} contains JDBC configuration. */
private static final String MONGO_CFG = "mongo.yaml";

/** Whether MongoDB support is selected. */
Expand All @@ -63,7 +63,7 @@ public static void main(final String[] args) throws IOException {
System.out.println("MongoDB database selected");
mongo = true;
} else {
System.out.println("MySQL/JDBC database selected");
System.out.println("JDBC database selected");
mongo = false;
}
startServer();
Expand Down
9 changes: 0 additions & 9 deletions ...-image/io.helidon.examples.dbclient/helidon-examples-dbclient-pokemon/reflect-config.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions integrations/db/h2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<properties>
<!--
To build javadocs we need to have a valid module-info file. But com.oracle.substratevm:svm appears
To build javadocs we need to have a valid module-info file. But org.graalvm.nativeimage:svm appears
to have a bad module-info. So for now we skip generating javadocs.
-->
<maven.javadoc.skip>true</maven.javadoc.skip>
Expand All @@ -44,7 +44,7 @@
<artifactId>h2</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.substratevm</groupId>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<scope>provided</scope>
</dependency>
Expand Down
4 changes: 3 additions & 1 deletion ...grations/db/ojdbc/src/main/resources/META-INF/helidon/native-image/reflection-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"classes": [
"org.hibernate.dialect.Oracle10gDialect"
"org.hibernate.dialect.Oracle10gDialect",
"oracle.jdbc.logging.annotations.Supports",
"oracle.jdbc.logging.annotations.Feature"
]
}
2 changes: 1 addition & 1 deletion integrations/graal/mp-native-image-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.oracle.substratevm</groupId>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<scope>provided</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions integrations/graal/native-image-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<properties>
<!--
To build javadocs we need to have a valid module-info file. But com.oracle.substratevm:svm appears
To build javadocs we need to have a valid module-info file. But org.graalvm.nativeimage:svm appears
to have a bad module-info. So for now we skip generating javadocs.
-->
<maven.javadoc.skip>true</maven.javadoc.skip>
Expand All @@ -55,7 +55,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.oracle.substratevm</groupId>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<scope>provided</scope>
</dependency>
Expand Down
Loading