Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
4d24c81
Go native with JHipster Native
Feb 7, 2022
82f69cf
Regenerate without caching
Feb 7, 2022
2b74471
Fix saving of photos
Feb 11, 2022
906742a
Fix Drew's EXIF library the proper way
Feb 12, 2022
f51f22d
Update with latest blueprint
Feb 17, 2022
9d3292f
Revert README changes
Feb 17, 2022
b507a02
Banner FTW!
Feb 17, 2022
ce523c3
Add GitHub Actions
Feb 18, 2022
0deba34
Revert scripts in package.json for CI
Feb 18, 2022
7dddb32
Hard code branch name for testing
Feb 18, 2022
7c97cc1
Polishing NativeHint
Feb 23, 2022
8d93772
Allocate more memory to build process
Feb 28, 2022
2cd14e6
Try using 10g
Feb 28, 2022
d4d8506
Bump native-build-tools to 0.9.10
Feb 28, 2022
b3319f2
Latest as of March 2, 2am MT
Mar 2, 2022
f7face4
Update to use JHipster Native blueprint v1.0
Mar 2, 2022
f1aeb57
Change CI to use JVM mode
Mar 2, 2022
74bd658
Make ci:e2e:package and ci:e2e:server:start use JHipster defaults so …
Mar 3, 2022
b779335
Restore 10g setting for GitHub Actions
Mar 3, 2022
2539ab5
Merge branch 'main' into spring-native
Mar 3, 2022
e52be4c
Fix album selector in spring-native branch
Mar 30, 2022
59f064d
Merge pull request #12 from oktadev/fix-album-selector
Mar 30, 2022
6518f07
Add demo script for JHipster Native blueprint
Mar 31, 2022
8afb5da
Update to use JHipster Native 1.1.1
Apr 15, 2022
4324003
Update Maven Wrapper to 3.8.5
Apr 15, 2022
2a0ee5e
Merge pull request #15 from oktadev/spring-native-update
Apr 16, 2022
3cab4e6
Upgrade to JHipster Native 1.1.2
Apr 22, 2022
058e941
Merge pull request #17 from oktadev/jhipster-native-1.1.2
Apr 22, 2022
625b848
Restore --remove-orphans so tests pass
Apr 27, 2022
d85bb7b
Update with latest versions and numbers
Apr 27, 2022
28023bb
Add M1 numbers
Apr 28, 2022
7313803
Move JHipster Native demo to its own file
May 1, 2022
1c67b87
Merge pull request #13 from oktadev/jhipster-native-demo
May 5, 2022
812df0c
Add blog post series
May 12, 2022
cc628b3
Fix typo
May 12, 2022
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
25 changes: 25 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/java/.devcontainer/base.Dockerfile

# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 11, 17, 11-bullseye, 17-bullseye, 11-buster, 17-buster
ARG VARIANT="11"
FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}

# [Option] Install Maven
ARG INSTALL_MAVEN="false"
ARG MAVEN_VERSION=""
# [Option] Install Gradle
ARG INSTALL_GRADLE="false"
ARG GRADLE_VERSION=""
RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
&& if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi

# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
ARG NODE_VERSION="none"
RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

# [Optional] Uncomment this line to install global node packages.
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
47 changes: 47 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/java
{
"name": "Flickr2",
"build": {
"dockerfile": "Dockerfile",
"args": {
// Update the VARIANT arg to pick a Java version: 11, 17
// Append -bullseye or -buster to pin to an OS version.
// Use the -bullseye variants on local arm64/Apple Silicon.
"VARIANT": "11",
// Options
"INSTALL_MAVEN": "true",
"INSTALL_GRADLE": "false",
"NODE_VERSION": "lts/*"
}
},

// Set *default* container specific settings.json values on container create.
"settings": {
"java.home": "/docker-java-home"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"christian-kohler.npm-intellisense",
"firsttris.vscode-jest-runner",
"ms-vscode.vscode-typescript-tslint-plugin",
"dbaeumer.vscode-eslint",
"vscjava.vscode-java-pack",
"pivotal.vscode-boot-dev-pack",
"esbenp.prettier-vscode"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [9060, 3001, 9000, 8080],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "java -version",

// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
"features": {
"docker-in-docker": "latest",
"docker-from-docker": "latest"
}
}
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ecmaFeatures": {
"jsx": true
},
"project": "./tsconfig.json"
"project": "./tsconfig.test.json"
},
"settings": {
"react": {
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Flickr2 CI
on: [push, pull_request]
jobs:
pipeline:
name: flickr2 pipeline
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.pull_request.title, '[skip ci]') && !contains(github.event.pull_request.title, '[ci skip]')"
timeout-minutes: 40
env:
NODE_VERSION: 16.13.1
SPRING_OUTPUT_ANSI_ENABLED: DETECT
SPRING_JPA_SHOW_SQL: false
JHI_DISABLE_WEBPACK_LOGS: true
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 16.13.1
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 11
- name: Install node.js packages
run: npm install
- name: Run backend test
run: |
chmod +x mvnw
npm run ci:backend:test
- name: Run frontend test
run: npm run ci:frontend:test
- name: Package application
run: npm run java:jar:prod
- name: 'E2E: Package'
run: npm run ci:e2e:package
- name: 'E2E: Prepare'
run: npm run ci:e2e:prepare
- name: 'E2E: Run'
run: npm run ci:e2e:run
env:
CYPRESS_ENABLE_RECORD: false
CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
- name: 'E2E: Teardown'
run: npm run ci:e2e:teardown
4 changes: 0 additions & 4 deletions .husky/pre-commit

This file was deleted.

26 changes: 13 additions & 13 deletions .jhipster/Album.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"name": "Album",
"applications": "*",
"changelogDate": "20211012075127",
"dto": "no",
"embedded": false,
"entityTableName": "album",
"fields": [
{
"fieldName": "title",
Expand All @@ -16,23 +20,19 @@
"fieldType": "Instant"
}
],
"fluentMethods": true,
"jpaMetamodelFiltering": false,
"name": "Album",
"pagination": "pagination",
"readOnly": false,
"relationships": [
{
"relationshipType": "many-to-one",
"otherEntityField": "login",
"otherEntityName": "user",
"otherEntityRelationshipName": "album",
"relationshipName": "user",
"otherEntityField": "login"
"relationshipType": "many-to-one"
}
],
"entityTableName": "album",
"dto": "no",
"pagination": "pagination",
"service": "no",
"jpaMetamodelFiltering": false,
"fluentMethods": true,
"readOnly": false,
"embedded": false,
"applications": "*",
"changelogDate": "20211012075127"
"service": "no"
}
32 changes: 16 additions & 16 deletions .jhipster/Photo.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"name": "Photo",
"applications": "*",
"changelogDate": "20211012075128",
"dto": "no",
"embedded": false,
"entityTableName": "photo",
"fields": [
{
"fieldName": "title",
Expand Down Expand Up @@ -34,31 +38,27 @@
"fieldType": "Instant"
}
],
"fluentMethods": true,
"jpaMetamodelFiltering": false,
"name": "Photo",
"pagination": "infinite-scroll",
"readOnly": false,
"relationships": [
{
"relationshipType": "many-to-one",
"otherEntityField": "title",
"otherEntityName": "album",
"otherEntityRelationshipName": "photo",
"relationshipName": "album",
"otherEntityField": "title"
"relationshipType": "many-to-one"
},
{
"relationshipType": "many-to-many",
"otherEntityField": "name",
"otherEntityName": "tag",
"otherEntityRelationshipName": "photo",
"ownerSide": true,
"relationshipName": "tag",
"otherEntityField": "name",
"ownerSide": true
"relationshipType": "many-to-many"
}
],
"entityTableName": "photo",
"dto": "no",
"pagination": "infinite-scroll",
"service": "no",
"jpaMetamodelFiltering": false,
"fluentMethods": true,
"readOnly": false,
"embedded": false,
"applications": "*",
"changelogDate": "20211012075128"
"service": "no"
}
26 changes: 13 additions & 13 deletions .jhipster/Tag.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"name": "Tag",
"applications": "*",
"changelogDate": "20211012075129",
"dto": "no",
"embedded": false,
"entityTableName": "tag",
"fields": [
{
"fieldName": "name",
Expand All @@ -8,23 +12,19 @@
"fieldValidateRulesMinlength": "2"
}
],
"fluentMethods": true,
"jpaMetamodelFiltering": false,
"name": "Tag",
"pagination": "infinite-scroll",
"readOnly": false,
"relationships": [
{
"relationshipType": "many-to-many",
"otherEntityName": "photo",
"otherEntityRelationshipName": "tag",
"ownerSide": false,
"relationshipName": "photo",
"ownerSide": false
"relationshipType": "many-to-many"
}
],
"entityTableName": "tag",
"dto": "no",
"pagination": "infinite-scroll",
"service": "no",
"jpaMetamodelFiltering": false,
"fluentMethods": true,
"readOnly": false,
"embedded": false,
"applications": "*",
"changelogDate": "20211012075129"
"service": "no"
}
1 change: 1 addition & 0 deletions .mvn/jvm.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-XX:+TieredCompilation -XX:TieredStopAtLevel=1
Binary file modified .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
82 changes: 46 additions & 36 deletions .yo-rc.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,62 @@
{
"generator-jhipster": {
"applicationType": "monolith",
"baseName": "flickr2",
"jhipsterVersion": "7.3.1",
"skipClient": false,
"skipServer": false,
"skipUserManagement": true,
"skipCheckLengthOfIdentifier": false,
"skipFakeData": false,
"jhiPrefix": "jhi",
"entitySuffix": "",
"dtoSuffix": "DTO",
"testFrameworks": ["cypress"],
"blueprints": [],
"otherModules": [],
"pages": [],
"creationTimestamp": 1634022348068,
"serviceDiscoveryType": "no",
"reactive": false,
"authenticationType": "oauth2",
"packageName": "com.auth0.flickr2",
"serverPort": "8080",
"cacheProvider": "ehcache",
"enableHibernateCache": true,
"databaseType": "sql",
"devDatabaseType": "h2Disk",
"prodDatabaseType": "postgresql",
"baseName": "flickr2",
"blueprints": [
{
"name": "generator-jhipster-native",
"version": "1.1.2"
}
],
"buildTool": "maven",
"serverSideOptions": [],
"websocket": false,
"searchEngine": false,
"messageBroker": false,
"enableSwaggerCodegen": false,
"cacheProvider": "no",
"clientFramework": "react",
"withAdminUi": true,
"clientPackageManager": "npm",
"clientTheme": "united",
"clientThemeVariant": "dark",
"enableTranslation": true,
"nativeLanguage": "en",
"creationTimestamp": 1634022348068,
"databaseType": "sql",
"devDatabaseType": "h2Disk",
"devServerPort": 9060,
"clientPackageManager": "npm",
"languages": ["en", "pt-br"],
"dtoSuffix": "DTO",
"enableGradleEnterprise": false,
"enableHibernateCache": false,
"enableSwaggerCodegen": false,
"enableTranslation": true,
"entities": ["Album", "Photo", "Tag"],
"lastLiquibaseTimestamp": 1634025089000,
"entitySuffix": "",
"herokuAppName": "flickr-2",
"herokuDeployType": "git",
"herokuJavaVersion": "11",
"useOkta": false
"jhiPrefix": "jhi",
"jhipsterVersion": "7.8.1",
"languages": ["en", "pt-br"],
"lastLiquibaseTimestamp": 1634025089000,
"messageBroker": false,
"nativeLanguage": "en",
"otherModules": [
{
"name": "generator-jhipster-native",
"version": "1.1.2"
}
],
"packageName": "com.auth0.flickr2",
"pages": [],
"prodDatabaseType": "postgresql",
"reactive": false,
"searchEngine": false,
"serverPort": "8080",
"serverSideOptions": [],
"serviceDiscoveryType": "no",
"skipCheckLengthOfIdentifier": false,
"skipClient": false,
"skipFakeData": false,
"skipServer": false,
"skipUserManagement": true,
"testFrameworks": ["cypress"],
"useOkta": false,
"websocket": false,
"withAdminUi": true
}
}
Loading