You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2022/06/08 00:27:15 UTC
[tapestry-5] branch master updated (7932ae56c -> 0c2598417)
This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
from 7932ae56c Merge pull request #34 from apache/TAP5-2728
new 4c862c5c3 Revert "TAP5-2718: Tapestry announcement lacks version"
new 6fc6de204 Adding @since to InjectComponent.optional()
new 0c2598417 TAP5-2718: missing version in Tapestry announcement log entries
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tapestry-core/build.gradle | 6 ------
.../src/main/java/org/apache/tapestry5/SymbolConstants.java | 4 ++--
.../main/java/org/apache/tapestry5/annotations/InjectComponent.java | 3 ++-
.../java/org/apache/tapestry5/corelib/pages/ExceptionReport.java | 3 +--
.../main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java | 3 +--
.../src/main/java/org/apache/tapestry5/modules/TapestryModule.java | 4 +---
tapestry-http/build.gradle | 2 +-
.../gradle/org.apache.tapestry/tapestry-http}/project.properties | 0
.../main/java/org/apache/tapestry5/http/TapestryHttpConstants.java | 3 ++-
.../java/org/apache/tapestry5/http/modules/TapestryHttpModule.java | 3 +--
.../tapestry5/internal/t5internal/components/InternalLayout.java | 4 ++--
11 files changed, 13 insertions(+), 22 deletions(-)
rename {tapestry-core/src/main/filtered-resources/META-INF/gradle/org.apache.tapestry/tapestry-core => tapestry-http/src/main/filtered-resources/META-INF/gradle/org.apache.tapestry/tapestry-http}/project.properties (100%)
[tapestry-5] 02/03: Adding @since to InjectComponent.optional()
Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 6fc6de2043654b20fce423ae3470be0bff3ea09d
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Tue Jun 7 18:30:05 2022 -0300
Adding @since to InjectComponent.optional()
---
.../main/java/org/apache/tapestry5/annotations/InjectComponent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectComponent.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectComponent.java
index cc69d9d51..07679b76e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectComponent.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectComponent.java
@@ -1,4 +1,4 @@
-// Copyright 2008, 2009 The Apache Software Foundation
+// Copyright 2008, 2009, 2022 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ public @interface InjectComponent
/**
* If true, allows the component to be missing without throwing an exception.
+ * @since 5.8.2
*/
boolean optional() default false;
}
[tapestry-5] 01/03: Revert "TAP5-2718: Tapestry announcement lacks version"
Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 4c862c5c3c50b72db39972ee708c52dd08184b25
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Tue Jun 7 18:24:03 2022 -0300
Revert "TAP5-2718: Tapestry announcement lacks version"
This reverts commit 191e7093e0e1ef7d93c4f588a225ce813b8e20b1.
---
.../META-INF/gradle/org.apache.tapestry/tapestry-core/project.properties | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/tapestry-core/src/main/filtered-resources/META-INF/gradle/org.apache.tapestry/tapestry-core/project.properties b/tapestry-http/src/main/filtered-resources/META-INF/gradle/org.apache.tapestry/tapestry-core/project.properties
similarity index 100%
rename from tapestry-core/src/main/filtered-resources/META-INF/gradle/org.apache.tapestry/tapestry-core/project.properties
rename to tapestry-http/src/main/filtered-resources/META-INF/gradle/org.apache.tapestry/tapestry-core/project.properties
[tapestry-5] 03/03: TAP5-2718: missing version in Tapestry announcement log entries
Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 0c259841714c174f5dc99481812051dee8d1575e
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Tue Jun 7 21:26:34 2022 -0300
TAP5-2718: missing version in Tapestry announcement log entries
---
tapestry-core/build.gradle | 6 ------
.../src/main/java/org/apache/tapestry5/SymbolConstants.java | 4 ++--
.../java/org/apache/tapestry5/corelib/pages/ExceptionReport.java | 3 +--
.../main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java | 3 +--
.../src/main/java/org/apache/tapestry5/modules/TapestryModule.java | 4 +---
tapestry-http/build.gradle | 2 +-
.../{tapestry-core => tapestry-http}/project.properties | 0
.../main/java/org/apache/tapestry5/http/TapestryHttpConstants.java | 3 ++-
.../java/org/apache/tapestry5/http/modules/TapestryHttpModule.java | 3 +--
.../tapestry5/internal/t5internal/components/InternalLayout.java | 4 ++--
10 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index 7b46abd99..0d79678b9 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -69,12 +69,6 @@ sourceSets {
// Not sure why this is necessary:
compileTestGroovy.dependsOn compileTestJava
-jar {
- from("src/main/filtered-resources") {
- filter(ReplaceTokens, tokens: [version: project.version])
- }
-}
-
test {
// Needed to have XMLTokenStreamTests.testStreamEncoding() passing on Java 9+
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_1_9)) {
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
index 35cc5609c..2206e47fe 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
@@ -100,9 +100,9 @@ public class SymbolConstants
/**
* The version number of the core Tapestry framework, or UNKNOWN if the version number is not available (which
* should only occur when developing Tapestry).
- * This is an alias for {@link TapestryHttpSymbolConstants#CHARSET}.
+ * This is an alias for {@link TapestryHttpSymbolConstants#TAPESTRY_VERSION}.
*/
- public static final String TAPESTRY_VERSION = TapestryHttpConstants.TAPESTRY_VERSION;
+ public static final String TAPESTRY_VERSION = TapestryHttpSymbolConstants.TAPESTRY_VERSION;
/**
* The location of the application-wide component messages catalog, relative to the web application context. This
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
index 2e3898e3b..ced7b6960 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
@@ -25,7 +25,6 @@ import org.apache.tapestry5.corelib.base.AbstractInternalPage;
import org.apache.tapestry5.func.F;
import org.apache.tapestry5.func.Mapper;
import org.apache.tapestry5.http.Link;
-import org.apache.tapestry5.http.TapestryHttpConstants;
import org.apache.tapestry5.http.TapestryHttpSymbolConstants;
import org.apache.tapestry5.http.services.BaseURLSource;
import org.apache.tapestry5.http.services.RequestGlobals;
@@ -72,7 +71,7 @@ public class ExceptionReport extends AbstractInternalPage implements ExceptionRe
private boolean productionMode;
@Inject
- @Symbol(TapestryHttpConstants.TAPESTRY_VERSION)
+ @Symbol(TapestryHttpSymbolConstants.TAPESTRY_VERSION)
@Property(write = false)
private String tapestryVersion;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java
index 9a0038d2c..f36ef434d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/T5Dashboard.java
@@ -15,7 +15,6 @@ package org.apache.tapestry5.corelib.pages;
import org.apache.tapestry5.Block;
import org.apache.tapestry5.annotations.*;
import org.apache.tapestry5.corelib.base.AbstractInternalPage;
-import org.apache.tapestry5.http.TapestryHttpConstants;
import org.apache.tapestry5.http.TapestryHttpSymbolConstants;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ioc.annotations.Symbol;
@@ -32,7 +31,7 @@ import org.apache.tapestry5.services.dashboard.DashboardManager;
public class T5Dashboard extends AbstractInternalPage
{
@Inject
- @Symbol(TapestryHttpConstants.TAPESTRY_VERSION)
+ @Symbol(TapestryHttpSymbolConstants.TAPESTRY_VERSION)
@Property
private String frameworkVersion;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
index d3c86da39..34b9bec4c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
@@ -104,12 +104,10 @@ import org.apache.tapestry5.commons.services.TypeCoercer;
import org.apache.tapestry5.commons.util.AvailableValues;
import org.apache.tapestry5.commons.util.CollectionFactory;
import org.apache.tapestry5.commons.util.StrategyRegistry;
-import org.apache.tapestry5.commons.util.VersionUtils;
import org.apache.tapestry5.corelib.data.SecureOption;
import org.apache.tapestry5.grid.GridConstants;
import org.apache.tapestry5.grid.GridDataSource;
import org.apache.tapestry5.http.Link;
-import org.apache.tapestry5.http.TapestryHttpConstants;
import org.apache.tapestry5.http.TapestryHttpSymbolConstants;
import org.apache.tapestry5.http.internal.TapestryHttpInternalConstants;
import org.apache.tapestry5.http.internal.TapestryHttpInternalSymbols;
@@ -1780,7 +1778,7 @@ public final class TapestryModule
@Symbol(SymbolConstants.OMIT_GENERATOR_META)
final boolean omitGeneratorMeta,
- @Symbol(TapestryHttpConstants.TAPESTRY_VERSION)
+ @Symbol(TapestryHttpSymbolConstants.TAPESTRY_VERSION)
final String tapestryVersion,
@Symbol(TapestryHttpSymbolConstants.PRODUCTION_MODE)
diff --git a/tapestry-http/build.gradle b/tapestry-http/build.gradle
index c9d4efc5c..60d888b46 100644
--- a/tapestry-http/build.gradle
+++ b/tapestry-http/build.gradle
@@ -27,6 +27,6 @@ compileTestGroovy.dependsOn compileTestJava
jar {
from("src/main/filtered-resources") {
- filter(ReplaceTokens, tokens: [version: project.version])
+ filter(ReplaceTokens, tokens: [version: project.parent.version])
}
}
\ No newline at end of file
diff --git a/tapestry-http/src/main/filtered-resources/META-INF/gradle/org.apache.tapestry/tapestry-core/project.properties b/tapestry-http/src/main/filtered-resources/META-INF/gradle/org.apache.tapestry/tapestry-http/project.properties
similarity index 100%
rename from tapestry-http/src/main/filtered-resources/META-INF/gradle/org.apache.tapestry/tapestry-core/project.properties
rename to tapestry-http/src/main/filtered-resources/META-INF/gradle/org.apache.tapestry/tapestry-http/project.properties
diff --git a/tapestry-http/src/main/java/org/apache/tapestry5/http/TapestryHttpConstants.java b/tapestry-http/src/main/java/org/apache/tapestry5/http/TapestryHttpConstants.java
index 52d205d3d..b87fa6532 100644
--- a/tapestry-http/src/main/java/org/apache/tapestry5/http/TapestryHttpConstants.java
+++ b/tapestry-http/src/main/java/org/apache/tapestry5/http/TapestryHttpConstants.java
@@ -30,7 +30,8 @@ final public class TapestryHttpConstants {
/**
* The version number of the core Tapestry framework, or UNKNOWN if the version number is not available (which
* should only occur when developing Tapestry).
+ * @deprecated use {@link TapestryHttpSymbolConstants#TAPESTRY_VERSION} instead.
*/
- public static final String TAPESTRY_VERSION = "tapestry.version";
+ public static final String TAPESTRY_VERSION = TapestryHttpSymbolConstants.TAPESTRY_VERSION;
}
diff --git a/tapestry-http/src/main/java/org/apache/tapestry5/http/modules/TapestryHttpModule.java b/tapestry-http/src/main/java/org/apache/tapestry5/http/modules/TapestryHttpModule.java
index 8b4d5a83e..fae0b50b3 100644
--- a/tapestry-http/src/main/java/org/apache/tapestry5/http/modules/TapestryHttpModule.java
+++ b/tapestry-http/src/main/java/org/apache/tapestry5/http/modules/TapestryHttpModule.java
@@ -30,7 +30,6 @@ import org.apache.tapestry5.commons.internal.util.TapestryException;
import org.apache.tapestry5.commons.services.CoercionTuple;
import org.apache.tapestry5.commons.util.VersionUtils;
import org.apache.tapestry5.http.OptimizedSessionPersistedObject;
-import org.apache.tapestry5.http.TapestryHttpConstants;
import org.apache.tapestry5.http.TapestryHttpSymbolConstants;
import org.apache.tapestry5.http.internal.AsyncRequestService;
import org.apache.tapestry5.http.internal.TypeCoercerHttpRequestBodyConverter;
@@ -127,7 +126,7 @@ public final class TapestryHttpModule {
configuration.add(TapestryHttpSymbolConstants.APPLICATION_VERSION, "0.0.1");
configuration.add(TapestryHttpSymbolConstants.GZIP_COMPRESSION_ENABLED, true);
configuration.add(TapestryHttpSymbolConstants.MIN_GZIP_SIZE, 100);
- configuration.add(TapestryHttpConstants.TAPESTRY_VERSION,
+ configuration.add(TapestryHttpSymbolConstants.TAPESTRY_VERSION,
VersionUtils.readVersionNumber("META-INF/gradle/org.apache.tapestry/tapestry-http/project.properties"));
configuration.add(TapestryHttpSymbolConstants.CORS_ENABLED, "false");
diff --git a/tapestry-internal-test/src/main/java/org/apache/tapestry5/internal/t5internal/components/InternalLayout.java b/tapestry-internal-test/src/main/java/org/apache/tapestry5/internal/t5internal/components/InternalLayout.java
index b9483edd5..bef2b5cb5 100644
--- a/tapestry-internal-test/src/main/java/org/apache/tapestry5/internal/t5internal/components/InternalLayout.java
+++ b/tapestry-internal-test/src/main/java/org/apache/tapestry5/internal/t5internal/components/InternalLayout.java
@@ -5,7 +5,7 @@ import org.apache.tapestry5.Block;
import org.apache.tapestry5.annotations.Import;
import org.apache.tapestry5.annotations.Parameter;
import org.apache.tapestry5.annotations.Property;
-import org.apache.tapestry5.http.TapestryHttpConstants;
+import org.apache.tapestry5.http.TapestryHttpSymbolConstants;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ioc.annotations.Symbol;
@@ -28,7 +28,7 @@ public class InternalLayout
private String title;
@Inject
- @Symbol(TapestryHttpConstants.TAPESTRY_VERSION)
+ @Symbol(TapestryHttpSymbolConstants.TAPESTRY_VERSION)
@Property
private String frameworkVersion;