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.

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

Update spring and hibernate Brianbolt/issue300 #302

Merged
merged 82 commits into from
May 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
f974114
Compiling but not starting in tomcat
brianbolt Apr 5, 2022
1f385fe
Removing swagger which was brining in old spring-web
brianbolt Apr 5, 2022
ddedbe6
Startup + setup scripts working
brianbolt Apr 5, 2022
d23c5a3
additioinal join columns
brianbolt Apr 5, 2022
388600c
Fix login
brianbolt Apr 5, 2022
68f168c
Another logger to put into stdout
brianbolt Apr 5, 2022
45a7a8d
Add firewall rule to allow doubleslash
brianbolt Apr 5, 2022
a6ab7ce
Fix hql to remove extra slash
brianbolt Apr 5, 2022
d0cfa7a
Remove .m2 addition
brianbolt Apr 5, 2022
51506f8
Update OperatorKind.java
brianbolt Apr 6, 2022
86818a5
Update ExperimentKind.java
brianbolt Apr 6, 2022
a06f93b
Update InteractionKind.java
brianbolt Apr 6, 2022
9265054
Update LabelKind.java
brianbolt Apr 6, 2022
0fbf117
Update LsRole.java
brianbolt Apr 6, 2022
7b2381f
Update ProtocolKind.java
brianbolt Apr 6, 2022
26ddd3b
Update RoleKind.java
brianbolt Apr 6, 2022
db591cd
Update StateKind.java
brianbolt Apr 6, 2022
a079be2
Update ThingKind.java
brianbolt Apr 6, 2022
d661c07
Update UnitKind.java
brianbolt Apr 6, 2022
69d6932
Update ValueType_Roo_Finder.aj
brianbolt Apr 6, 2022
a56f970
Update ValueType_Roo_Finder.aj
brianbolt Apr 6, 2022
a0b5d6f
Update ValueType.java
brianbolt Apr 6, 2022
45d3162
Update ValueType.java
brianbolt Apr 6, 2022
15378f2
Make sure ACAS connects to the specified acas schema rather than rely…
brianbolt Apr 12, 2022
340734f
Add back dom4j
brianbolt Apr 12, 2022
a22ac22
spring-ldap-core to properties
brianbolt Apr 12, 2022
46be839
Remove deprecated codehaus.jackson libraries
brianbolt Apr 12, 2022
84a1238
Add JoinColumn(name="XX") to any columns added by hibernate
brianbolt Apr 12, 2022
d388f23
Removing setting search path explicitly
brianbolt Apr 12, 2022
43e37e7
Units controller
brianbolt Apr 27, 2022
7230a7f
Solution unit controller
brianbolt Apr 27, 2022
d5ef24b
Salt Controller merge
brianbolt Apr 27, 2022
bab6c19
Isotope controller
brianbolt Apr 27, 2022
d8e7448
Remove unused stereocategory controller
brianbolt Apr 27, 2022
b2bd088
Compound type controller
brianbolt Apr 27, 2022
82595f3
Parent annotations controller
brianbolt Apr 27, 2022
daf5ad4
Add back transactional
brianbolt Apr 27, 2022
d94e236
Physical state controller
brianbolt Apr 27, 2022
bc6a8a9
Operator controller
brianbolt Apr 27, 2022
dc6b157
Purity measured by controller
brianbolt Apr 27, 2022
6aa3875
Remove unused vendor controller
brianbolt Apr 27, 2022
c3c537a
File type controller
brianbolt Apr 27, 2022
b453614
File save controller
brianbolt Apr 27, 2022
ce23956
Metalot controller
brianbolt Apr 27, 2022
c23e446
Search form controller
brianbolt Apr 27, 2022
a6e018d
Fix api/v1 path for search form controller
brianbolt Apr 27, 2022
592ba7e
Reg search controller
brianbolt Apr 27, 2022
1473715
Structure image controller
brianbolt Apr 27, 2022
3d27c13
Fix package
brianbolt Apr 27, 2022
c8c276a
Remove unused web controllers
brianbolt Apr 28, 2022
3f1630c
Merge pull request #309 from mcneilco/brianbolt/issue308
brianbolt Apr 28, 2022
499aa4d
Remove roo generate web interface
brianbolt Apr 28, 2022
1a52dc9
Remove tiles
brianbolt Apr 28, 2022
bf34671
Pushin all aspectj files
brianbolt Apr 29, 2022
a196a31
Fix bbchem compilation
brianbolt Apr 29, 2022
12c720b
Remove roo dependencies and annotations
brianbolt Apr 29, 2022
7b97f0e
Merge pull request #311 from mcneilco/brianbolt/issue310
bffrost Apr 29, 2022
7ae53d4
Remove uiModel methods
brianbolt Apr 29, 2022
efb6a1b
Remove encodeUrlPathSegment methods
brianbolt Apr 29, 2022
6fcfba2
Remove get options methods
brianbolt Apr 29, 2022
34fd002
Remove populateX methods
brianbolt Apr 29, 2022
6aea356
Remove unused autowired services conversionService_dtt, messageSource…
brianbolt Apr 29, 2022
8ebea25
Organize imports on all java files
brianbolt Apr 29, 2022
89dba1d
Ran vscode format on all .java files
brianbolt Apr 29, 2022
e1450a2
Fix application context security double ;; issue
brianbolt Apr 29, 2022
e057bdc
Merge pull request #312 from mcneilco/brianbolt/issue307
brianbolt Apr 29, 2022
4eed4a2
Merge branch 'brianbolt/issue313' into brianbolt/issue315
brianbolt Apr 29, 2022
a2c18b1
Merge pull request #314 from mcneilco/brianbolt/issue313
brianbolt Apr 29, 2022
b224620
Update pom.xml dependencies in acas-roo-server-oss
brianbolt Apr 30, 2022
116cdcf
Run format on pom.xml
brianbolt Apr 30, 2022
90b4add
Added a few notes around depdendencies
brianbolt May 2, 2022
a00da46
Merge pull request #316 from mcneilco/brianbolt/issue315
brianbolt May 2, 2022
a541222
Only include dom4j and trove4j in jchem builds where they are required
brianbolt May 2, 2022
91f6f0c
Note about log4j settings
brianbolt May 2, 2022
af25e6b
Merge branch 'release/1.13.7' into brianbolt/issue300
brianbolt May 3, 2022
8962928
Bump tomcat version
brianbolt May 3, 2022
7c08b1a
Hibernate bump to 5.6.1.Final
brianbolt May 3, 2022
4491b52
Fixing uses of splitHqlInClause
brianbolt May 3, 2022
bf8b8e1
Fixing uses of addHqlInClause
brianbolt May 3, 2022
76a1664
Switch to org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamin…
brianbolt May 4, 2022
99583a0
Merge pull request #318 from mcneilco/brianbolt/issue317
brianbolt May 4, 2022
f45e342
Merge pull request #320 from mcneilco/brianbolt/issue319
brianbolt May 4, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
.project
.classpath
.settings
log.roo
.vscode
.m2
lib
4 changes: 3 additions & 1 deletion Dockerfile-multistage
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ FROM dependencies as bbchem
FROM dependencies as indigo

FROM ${CHEMISTRY_PACKAGE} as compile

ADD pom.xml /src/pom.xml
WORKDIR /src
RUN mvn dependency:resolve -P ${CHEMISTRY_PACKAGE}
Expand All @@ -35,7 +36,8 @@ RUN curl -fsSL https://deb.nodesource.com/setup_$NODE_VERSION | bash - && \
ENV NODE_PATH /usr/lib/node_modules

# Add runner user so we don't run as root
RUN useradd -u 1000 -ms /bin/bash runner
RUN useradd -u 1000 -ms /bin/bash runner && \
chown -R runner:runner /usr/local/tomcat/
brianbolt marked this conversation as resolved.
Show resolved Hide resolved

# Allow certificates to be added by runner
RUN chgrp runner /usr/local/openjdk-8/lib/security/cacerts && \
Expand Down
331 changes: 0 additions & 331 deletions labsynch_v2.13.roo

This file was deleted.

Loading