Skip to content

Commit fbbae6c

Browse files
andrchanandrchan
authored
Merge pull request #32 from andrchan/master
Update changes for Commerce 2205
2 parents 3a58247 + e9b2d53 commit fbbae6c

File tree

126 files changed

+1444
-944
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+1444
-944
lines changed

‎core-customize/hybris/bin/custom/yb2bacceleratorstorefront/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<classpathentry exported="true" kind="src" path="/yacceleratorfacades" />
88
<classpathentry exported="false" kind="lib" path="web/webroot/WEB-INF/lib/javax.servlet.jsp.jstl-1.2.5.jar" />
99
<classpathentry exported="false" kind="lib" path="web/webroot/WEB-INF/lib/json-taglib-0.4.1.jar" />
10-
<classpathentry exported="false" kind="lib" path="web/webroot/WEB-INF/lib/jsoup-1.11.3.jar" />
10+
<classpathentry exported="false" kind="lib" path="web/webroot/WEB-INF/lib/jsoup-1.14.2.jar" />
1111
<classpathentry exported="false" kind="lib" path="web/webroot/WEB-INF/lib/rhino-1.7.7.jar" />
1212
<classpathentry exported="false" kind="lib" path="web/webroot/WEB-INF/lib/wro4j-core-1.8.0.jar" />
1313
<classpathentry exported="true" kind="lib" path="resources" />

‎core-customize/hybris/bin/custom/yb2bacceleratorstorefront/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
1818
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
1919
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
2020
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
21-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
21+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
2222
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
23-
org.eclipse.jdt.core.compiler.compliance=11
23+
org.eclipse.jdt.core.compiler.compliance=17
2424
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
2525
org.eclipse.jdt.core.compiler.debug.localVariable=generate
2626
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
132132
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
133133
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
134134
org.eclipse.jdt.core.compiler.release=disabled
135-
org.eclipse.jdt.core.compiler.source=11
135+
org.eclipse.jdt.core.compiler.source=17
136136
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
137137
org.eclipse.jdt.core.compiler.taskPriorities=
138138
org.eclipse.jdt.core.compiler.taskTags=

‎core-customize/hybris/bin/custom/yb2bacceleratorstorefront/.settings/org.eclipse.jdt.ui.prefs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ comment_new_line_for_parameter=false
1111
comment_separate_root_tags=true
1212
eclipse.preferences.version=1
1313
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
14-
formatter_settings_version=11
14+
formatter_settings_version=17
1515
org.eclipse.jdt.ui.exception.name=e
1616
org.eclipse.jdt.ui.gettersetter.use.is=true
1717
org.eclipse.jdt.ui.ignorelowercasenames=true

‎core-customize/hybris/bin/custom/yb2bacceleratorstorefront/buildcallbacks.xml‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,12 @@
217217
<remove path="/*[local-name()='groups']/*[local-name()='group'][@name='${targetThemeCode}_responsive']"/>
218218

219219
<insert path="/*[local-name()='groups']">
220-
221-
<![CDATA[
220+
<![CDATA[
222221
<group name="${targetThemeCode}_responsive" xmlns="http://www.isdc.ro/wro">
223222
<css>/_ui/responsive/theme-${targetThemeCode}/css/style.css</css>
224223
</group>
225224
]]>
226-
227-
</insert>
225+
</insert>
228226

229227
</xmltask>
230228

@@ -885,12 +883,10 @@
885883
<xmltask destbuffer="buffer" sourcebuffer="buffer">
886884

887885
<insert path="/groups/group[@name='addons_responsive']">
888-
889-
<![CDATA[
886+
<![CDATA[
890887
<js>${addonPath}@{jsfile}</js>
891888
]]>
892-
893-
</insert>
889+
</insert>
894890

895891
</xmltask>
896892

@@ -905,12 +901,10 @@
905901
<xmltask destbuffer="buffer" sourcebuffer="buffer">
906902

907903
<insert path="/groups/group[@name='addons_responsive']">
908-
909-
<![CDATA[
904+
<![CDATA[
910905
<css>${addonPath}@{cssfile}</css>
911906
]]>
912-
913-
</insert>
907+
</insert>
914908

915909
</xmltask>
916910

@@ -939,12 +933,10 @@
939933
<xmltask destbuffer="buffer" sourcebuffer="buffer">
940934

941935
<insert path="/groups/group[@name='addons_desktop']">
942-
943-
<![CDATA[
936+
<![CDATA[
944937
<js>${addonPath}@{jsfile}</js>
945938
]]>
946-
947-
</insert>
939+
</insert>
948940

949941
</xmltask>
950942

@@ -959,12 +951,10 @@
959951
<xmltask destbuffer="buffer" sourcebuffer="buffer">
960952

961953
<insert path="/groups/group[@name='addons_desktop']">
962-
963-
<![CDATA[
954+
<![CDATA[
964955
<css>${addonPath}@{cssfile}</css>
965956
]]>
966-
967-
</insert>
957+
</insert>
968958

969959
</xmltask>
970960

‎core-customize/hybris/bin/custom/yb2bacceleratorstorefront/extensioninfo.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<!--
3-
Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
3+
Copyright (c) 2022 SAP SE or an SAP affiliate company. All rights reserved.
44
--><extensioninfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="extensioninfo.xsd">
55

66

@@ -20,7 +20,10 @@
2020
<meta key="modulegen-name" value="accelerator"/>
2121

2222

23-
23+
24+
25+
<meta key="deprecated" value="true"/>
26+
2427

2528
</extension>
2629

‎core-customize/hybris/bin/custom/yb2bacceleratorstorefront/external-dependencies.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>de.hybris.platform</groupId>
88
<artifactId>yb2bacceleratorstorefront</artifactId>
9-
<version>2105.0</version>
9+
<version>2205.0</version>
1010

1111
<packaging>jar</packaging>
1212

‎core-customize/hybris/bin/custom/yb2bacceleratorstorefront/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"enquire" : "2.1.2",
1111
"Imager" : "",
1212
"jquery" : "3.5.1",
13-
"jquery-ui" : "1.12.1",
13+
"jquery-ui" : "1.13.0",
1414
"jquery.blockUI" : "2.66",
1515
"jquery.colorbox" : "1.5.14",
1616
"jquery.currencies" : "",

0 commit comments

Comments
 (0)