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

[ACS-9045] bump spring #68

Merged
merged 3 commits into from
Dec 16, 2024
Merged

[ACS-9045] bump spring #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b16ebab
[ACS-9045] bump spring
kmagdziarz Dec 13, 2024
36aaf3a
[ACS-9045] Remove no longer supported headers
kmagdziarz Dec 16, 2024
c4a7022
[ACS-9045] Prepare 10.0 release
kmagdziarz Dec 16, 2024
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
6 changes: 3 additions & 3 deletions surf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<name>Surf Modules</name>
<description>Surf Web-Framework project and configuration information for Surf modules</description>
<packaging>pom</packaging>
<version>9.3-SNAPSHOT</version>
<version>10.0-SNAPSHOT</version>

<distributionManagement>
<repository>
Expand Down Expand Up @@ -55,9 +55,9 @@

<properties>
<!-- Surf projects historically use 'spring.version' property -->
<spring.version>6.1.13</spring.version>
<spring.version>6.2.0</spring.version>
<dependency.alfresco-core.version>8.425</dependency.alfresco-core.version>
<dependency.webscripts.version>9.4</dependency.webscripts.version>
<dependency.webscripts.version>10.0</dependency.webscripts.version>
<dependency.freemarker.version>2.3.30-jakarta-1</dependency.freemarker.version>
<dependency.rhino.version>1.7.13</dependency.rhino.version>
<dependency.yui.version>2.9.0-alfresco-20141223</dependency.yui.version>
Expand Down
2 changes: 1 addition & 1 deletion surf/spring-cmis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.alfresco.surf</groupId>
<artifactId>surf-parent</artifactId>
<version>9.3-SNAPSHOT</version>
<version>10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion surf/spring-cmis/spring-cmis-framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco.surf</groupId>
<artifactId>spring-surf-cmis</artifactId>
<version>9.3-SNAPSHOT</version>
<version>10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion surf/spring-surf-archetype/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.alfresco.surf</groupId>
<artifactId>surf-parent</artifactId>
<version>9.3-SNAPSHOT</version>
<version>10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spring-surf-archetype</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco.surf</groupId>
<artifactId>surf-parent</artifactId>
<version>9.3-SNAPSHOT</version>
<version>10.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion surf/spring-surf/spring-surf-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco.surf</groupId>
<artifactId>surf-parent</artifactId>
<version>9.3-SNAPSHOT</version>
<version>10.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion surf/spring-surf/spring-surf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco.surf</groupId>
<artifactId>surf-parent</artifactId>
<version>9.3-SNAPSHOT</version>
<version>10.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
12 changes: 1 addition & 11 deletions ...g-surf/src/main/resources/org/springframework/extensions/surf/spring-surf-mvc-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
<property name="dependencyAggregator" ref="dependency.aggregator" />
<property name="webframeworkConfigElement" ref="webframework.config.element"/>
<property name="defaultUrl"><value>/resources</value></property>
<property name="useExpiresHeader"><value>true</value></property>
<property name="useCacheControlHeader"><value>true</value></property>
</bean>

<!-- Abstract Beans -->
Expand Down Expand Up @@ -71,14 +69,10 @@
<!-- Web Framework Controllers -->
<bean id="remoteController" class="org.springframework.extensions.surf.mvc.RemoteController">
<property name="cacheSeconds" value="-1" />
<property name="useExpiresHeader"><value>true</value></property>
<property name="useCacheControlHeader"><value>true</value></property>
<property name="frameworkUtil" ref="framework.utils"></property>
</bean>
<bean id="loginController" class="org.springframework.extensions.surf.mvc.LoginController">
<property name="cacheSeconds" value="-1" />
<property name="useExpiresHeader"><value>true</value></property>
<property name="useCacheControlHeader"><value>true</value></property>
<property name="userFactory" ref="user.factory"></property>
<property name="webFrameworkConfiguration" ref="webframework.config.element"></property>
<property name="supportedMethods">
Expand All @@ -91,8 +85,6 @@
</bean>
<bean id="logoutController" class="org.springframework.extensions.surf.mvc.LogoutController">
<property name="cacheSeconds" value="-1" />
<property name="useExpiresHeader"><value>true</value></property>
<property name="useCacheControlHeader"><value>true</value></property>
<property name="supportedMethods">
<list>
<value>HEAD</value>
Expand All @@ -103,8 +95,6 @@
</bean>
<bean id="feedController" class="org.springframework.extensions.surf.mvc.FeedController">
<property name="cacheSeconds" value="-1" />
<property name="useExpiresHeader"><value>true</value></property>
<property name="useCacheControlHeader"><value>true</value></property>
<property name="connectorService" ref="connector.service" />
</bean>

Expand All @@ -124,4 +114,4 @@
<!-- Locale Resolver -->
<bean id="localeResolver" class="org.springframework.extensions.surf.mvc.LocaleResolver" />

</beans>
</beans>
2 changes: 1 addition & 1 deletion surf/spring-webeditor-client/spring-webeditor-client-jsp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco.surf</groupId>
<artifactId>surf-parent</artifactId>
<version>9.3-SNAPSHOT</version>
<version>10.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion surf/spring-webeditor/spring-webeditor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco.surf</groupId>
<artifactId>surf-parent</artifactId>
<version>9.3-SNAPSHOT</version>
<version>10.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Loading