Version 2.1.0 - see CHANGELOG.md

loiclefevre · May 26, 2021 · f63d832 · f63d832
1 parent 4bc1694
commit f63d832
Show file tree

Hide file tree

Showing 72 changed files with 7,081 additions and 2,206 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+# v2.1.0 - 2021.05.26
+## New features
+- added support for Oracle JavaScript Extension Toolkit with the -create-jet-app command line option - huge thanks to Paolo Bellardone!
+- added support for Autonomous Database 21c
+- added support for Autonomous JSON Database Always Free
+- added support for Autonomous Application Express (APEX) Always Free
+- added support for Autonomous JSON Database
+- added support for Autonomous Application Express (APEX)
+- added support for Oracle Cloud Infrastructure Limits
+  - helps checking the remaining number of Always Free Database available for a given tenant
+- upgraded development infrastructure to GraalVM 21.1.0
+- upgraded Node.js v14 version for React based frontend
+- upgraded React Scripts to v4.0.3
+- upgraded Axios to v0.21.1
+- improved local configuration with Graph Studio URL, APEX and ORDS version
+
+## Fixes
+- fixed stack environment requirements
+  - GraalVM and Node.js versions
+  - tar command
+  - Node.js path for Windows
+- fixed SODA collection creation using SODA for REST
+
+
 # v2.0.8 - 2020.12.08
 ## New features
 - added OCI group and policies information in case you encounter related issue

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>com.oracle</groupId>
     <artifactId>dragon</artifactId>
-    <version>2.0.8</version>
+    <version>2.1.0</version>
 
     <name>Dragon Stack</name>
 
@@ -18,8 +18,9 @@
         <maven.compiler.target>${targetJavaVersion}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
-        <graalvm.version>20.3.0</graalvm.version>
-        <oci.sdk.version>1.25.4</oci.sdk.version>
+        <graalvm.version>21.1.0</graalvm.version>
+        <!-- <oci.sdk.version>1.25.4</oci.sdk.version> -->
+        <oci.sdk.version>1.36.5</oci.sdk.version>
     </properties>
 
     <dependencies>
@@ -63,6 +64,11 @@
             <artifactId>oci-java-sdk-identity</artifactId>
             <version>${oci.sdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.oracle.oci.sdk</groupId>
+            <artifactId>oci-java-sdk-limits</artifactId>
+            <version>${oci.sdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
             <artifactId>graal-sdk</artifactId>
@@ -106,6 +112,7 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
@@ -134,6 +141,7 @@
                 <version>2.22.2</version>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.1.1</version>
             </plugin>
@@ -164,12 +172,9 @@
                         --initialize-at-build-time=sun.instrument.InstrumentationImpl
                         --rerun-class-initialization-at-runtime=org.bouncycastle.jcajce.provider.drbg.DRBG$Default
                         --rerun-class-initialization-at-runtime=org.bouncycastle.jcajce.provider.drbg.DRBG$NonceAndIV
+                        -H:+TraceNativeToolUsage
+                        -H:-CheckToolchain
                     </buildArgs>
-                    <!--
-                                            -H:+TraceClassInitialization
-                        - - rerun-class-initialization-at-runtime=org.bouncycastle.jcajce.provider.drbg.DRBG$Default,org.bouncycastle.jcajce.provider.drbg.DRBG$NonceAndIV
--->
-
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/main/java/com/oracle/dragon/model/LocalDragonConfiguration.java b/src/main/java/com/oracle/dragon/model/LocalDragonConfiguration.java
@@ -8,9 +8,12 @@ public class LocalDragonConfiguration {
     private String sqlDevWeb;
     private String apexURL;
     private String omlURL;
+    private String graphStudioURL;
     private String sqlAPI;
     private String sodaAPI;
     private String version;
+    private String apexVersion;
+    private String ordsVersion;
     private String dbName;
     private String dbUserName;
     private String dbUserPassword;
@@ -60,6 +63,14 @@ public void setOmlURL(String omlURL) {
         this.omlURL = omlURL;
     }
 
+    public String getGraphStudioURL() {
+        return graphStudioURL;
+    }
+
+    public void setGraphStudioURL(String graphStudioURL) {
+        this.graphStudioURL = graphStudioURL;
+    }
+
     public String getVersion() {
         return version;
     }
@@ -68,6 +79,22 @@ public void setVersion(String version) {
         this.version = version;
     }
 
+    public String getApexVersion() {
+        return apexVersion;
+    }
+
+    public void setApexVersion(String apexVersion) {
+        this.apexVersion = apexVersion;
+    }
+
+    public String getOrdsVersion() {
+        return ordsVersion;
+    }
+
+    public void setOrdsVersion(String ordsVersion) {
+        this.ordsVersion = ordsVersion;
+    }
+
     public String getDbName() {
         return dbName;
     }

diff --git a/src/main/java/com/oracle/dragon/stacks/CodeGenerator.java b/src/main/java/com/oracle/dragon/stacks/CodeGenerator.java
@@ -282,8 +282,9 @@ private void extractFileContent(String path, File parent, InputStream inputStrea
             final String realFilename = path.substring(0, path.length() - 3);
             section.print(realFilename);
             // replace tokens!
-            final char startDelim = realFilename.endsWith(".js") ? '%' : '<';
-            final char stopDelim = realFilename.endsWith(".js") ? '%' : '>';
+            final boolean taggedFile = realFilename.endsWith(".js") || realFilename.endsWith(".html") || realFilename.endsWith(".htm") || realFilename.endsWith(".xml");
+            final char startDelim = taggedFile ? '%' : '<';
+            final char stopDelim = taggedFile ? '%' : '>';
 
             try (final InputStream content = inputStream) {
                 final ST st = new ST(

diff --git a/src/main/java/com/oracle/dragon/stacks/StackType.java b/src/main/java/com/oracle/dragon/stacks/StackType.java
@@ -5,6 +5,7 @@
 
 public enum StackType {
     REACT("React", "create-react-app", null),
+    JET("Jet", "create-jet-app", null),
     SPRINGBOOTPETCLINIC("Spring Boot","create-spring-boot-petclinic", new SpringBootPetclinicCodePatcher());
 
     public final String resourceDir;