Merge branch 'develop' into as2wasm
diff --git a/NOTICE b/NOTICE
index fa9e750..ee01330 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Royale Compiler
-Copyright 2012-2017 The Apache Software Foundation
+Copyright 2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/NOTICE.base b/NOTICE.base
index ba002ff..1a99147 100644
--- a/NOTICE.base
+++ b/NOTICE.base
@@ -1,5 +1,5 @@
Apache Royale Compiler
-Copyright 2012-2017 The Apache Software Foundation
+Copyright 2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/NOTICE.fdb b/NOTICE.fdb
index f4b1b1a..e8dea8a 100644
--- a/NOTICE.fdb
+++ b/NOTICE.fdb
@@ -1,5 +1,5 @@
Apache Royale Debugger
-Copyright 2012-2017 The Apache Software Foundation
+Copyright 2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/NOTICE.oem b/NOTICE.oem
index 77532e7..1dc6435 100644
--- a/NOTICE.oem
+++ b/NOTICE.oem
@@ -1,5 +1,5 @@
Apache Royale Compiler
-Copyright 2012-2017 The Apache Software Foundation
+Copyright 2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml
index f038fe4..1b8cdb6 100644
--- a/compiler-common/pom.xml
+++ b/compiler-common/pom.xml
@@ -17,18 +17,17 @@
limitations under the License.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>compiler-common</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Royale: Compiler: Compiler-Common</name>
<description>The Apache Royale Compiler Common classes</description>
diff --git a/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java b/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java
index 57d781c..226b7e6 100644
--- a/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java
+++ b/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java
@@ -3153,8 +3153,7 @@
@RoyaleOnly
public void setExcludeDefaultsCSSFiles(ConfigurationValue cv, List<String> paths) throws CannotOpen
{
- final ImmutableList<String> resolved = resolvePathsStrict(ImmutableList.copyOf(paths), cv, true);
- for (final String path : resolved)
+ for (final String path : paths)
{
excludeDefaultsCSSFiles.addFirst(path);
}
diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml
index 3c572af..9980cb6 100644
--- a/compiler-externc/pom.xml
+++ b/compiler-externc/pom.xml
@@ -17,18 +17,17 @@
limitations under the License.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>compiler-externc</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Royale: Compiler: Externc</name>
<description>The Apache Royale Compiler Externs Compiler</description>
@@ -128,7 +127,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-common</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.javascript</groupId>
@@ -139,7 +138,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
index 5208b9a..f276eda 100644
--- a/compiler-jx/pom.xml
+++ b/compiler-jx/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>compiler-jx</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Royale: Compiler: Compiler-JX</name>
@@ -73,17 +73,17 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-common</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-externc</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-externc</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml
index fb538fe..dabe14c 100644
--- a/compiler-test-utils/pom.xml
+++ b/compiler-test-utils/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Royale: Compiler: Test Utils</name>
<description>
diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
index 5052a06..96834a9 100644
--- a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
+++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
@@ -84,7 +84,7 @@
@Override
public String getFlexManifestPath(String type) {
- return env.SDK + "\\frameworks\\" + type + "-manifest.xml";
+ return FilenameNormalization.normalize(env.SDK + "\\frameworks\\" + type + "-manifest.xml");
}
@Override
diff --git a/compiler/pom.xml b/compiler/pom.xml
index fb4eec2..73f28f3 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>compiler</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Royale: Compiler: Compiler</name>
<description>The Apache Royale Compiler</description>
@@ -315,6 +315,7 @@
<configuration>
<runOrder>alphabetical</runOrder>
<includes>
+ <include>**/AAAMavenTestExternc.java</include>
<include>**/AAMavenTestSWCs.java</include>
<include>**/*Tests.java</include>
</includes>
@@ -419,7 +420,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-common</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flex</groupId>
@@ -471,13 +472,13 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-externc</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSNamespaceDefinition.java b/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSNamespaceDefinition.java
index 2a2e217..2a2951a 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSNamespaceDefinition.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSNamespaceDefinition.java
@@ -43,7 +43,9 @@
{
super(tree, tokenStream, CSSModelTreeType.NAMESPACE_DEFINITION);
assert uri != null : "@namespace URI can't be null.";
- assert CSSStringPropertyValue.isQuoted(uri) : "Do not strip namespace quotes in parser.";
+ if (!uri.equals("<missing STRING>")) {
+ assert CSSStringPropertyValue.isQuoted(uri) : "Do not strip namespace quotes in parser.";
+ }
this.prefix = prefix;
this.uri = CSSStringPropertyValue.stripQuotes(uri);
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/SourceFragmentsReader.java b/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/SourceFragmentsReader.java
index b511e26..84e6a50 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/SourceFragmentsReader.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/SourceFragmentsReader.java
@@ -21,6 +21,8 @@
import java.io.StringReader;
+import org.apache.royale.compiler.constants.IMXMLCoreConstants;
+
public class SourceFragmentsReader extends StringReader
{
/**
@@ -37,6 +39,28 @@
}
/**
+ * Concatenates the physical text of multiple source fragments.
+ */
+ public static String concatPhysicalText(ISourceFragment[] sourceFragments)
+ {
+ StringBuilder sb = new StringBuilder();
+ for (ISourceFragment sourceFragment : sourceFragments)
+ {
+ String physicalText = sourceFragment.getPhysicalText();
+ if (physicalText.startsWith(IMXMLCoreConstants.cDataStart))
+ {
+ physicalText = physicalText.substring(IMXMLCoreConstants.cDataStart.length());
+ if (physicalText.endsWith(IMXMLCoreConstants.cDataEnd))
+ {
+ physicalText = physicalText.substring(0, physicalText.length() - IMXMLCoreConstants.cDataEnd.length());
+ }
+ }
+ sb.append(physicalText);
+ }
+ return sb.toString();
+ }
+
+ /**
* Constructor.
*/
SourceFragmentsReader(ISourceFragment[] sourceFragments)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
index dca076a..90e5836 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
@@ -26,6 +26,7 @@
import java.util.Map;
import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.constants.IMXMLCoreConstants;
import org.apache.royale.compiler.definitions.IClassDefinition;
import org.apache.royale.compiler.definitions.IDefinition;
import org.apache.royale.compiler.definitions.IEffectDefinition;
@@ -35,6 +36,10 @@
import org.apache.royale.compiler.definitions.IVariableDefinition;
import org.apache.royale.compiler.internal.definitions.ClassDefinition;
import org.apache.royale.compiler.internal.mxml.MXMLDialect;
+import org.apache.royale.compiler.internal.mxml.MXMLTagData;
+import org.apache.royale.compiler.internal.mxml.MXMLTextData;
+import org.apache.royale.compiler.internal.parsing.SourceFragment;
+import org.apache.royale.compiler.internal.parsing.mxml.MXMLToken;
import org.apache.royale.compiler.internal.projects.RoyaleProject;
import org.apache.royale.compiler.internal.scopes.ASProjectScope;
import org.apache.royale.compiler.internal.tree.as.NodeBase;
@@ -42,9 +47,11 @@
import org.apache.royale.compiler.mxml.IMXMLTagData;
import org.apache.royale.compiler.mxml.IMXMLTextData;
import org.apache.royale.compiler.mxml.IMXMLUnitData;
+import org.apache.royale.compiler.parsing.MXMLTokenTypes;
import org.apache.royale.compiler.problems.ICompilerProblem;
import org.apache.royale.compiler.problems.MXMLDuplicateChildTagProblem;
import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
import org.apache.royale.compiler.tree.as.IASNode;
import org.apache.royale.compiler.tree.mxml.IMXMLClassReferenceNode;
import org.apache.royale.compiler.tree.mxml.IMXMLEventSpecifierNode;
@@ -153,6 +160,12 @@
private IVariableDefinition defaultPropertyDefinition;
/**
+ * The definition of an alternate default property. This gets lazily initialized by
+ * {@code getDefaultPropertyDefinition()} if we need to know it.
+ */
+ private IVariableDefinition altDefaultPropertyDefinition;
+
+ /**
* A flag that keeps track of whether the {@code defaultPropertyDefinition}
* field has been initialized. Simply checking whether it is
* <code>null</code> doesn't work, because <code>null</code> means
@@ -518,6 +531,66 @@
}
}
}
+ else if (altDefaultPropertyDefinition != null && !processedDefaultProperty && altDefaultPropertyDefinition.getBaseName().equals("innerHTML"))
+ {
+ String uri = childTag.getURI();
+ if (uri.equals("library://ns.apache.org/royale/html"))
+ {
+ IVariableDefinition textDef = (IVariableDefinition)project.resolveSpecifier(classReference, "innerHTML");
+ if (textDef != null)
+ {
+ List<IMXMLNode> nodes = info.getChildNodeList();
+ if (nodes.size() > 0)
+ {
+ IMXMLNode lastNode = nodes.get(nodes.size() - 1);
+ if (lastNode.getNodeID() == ASTNodeID.MXMLPropertySpecifierID)
+ {
+ MXMLPropertySpecifierNode propNode = (MXMLPropertySpecifierNode)lastNode;
+ String name = propNode.getName();
+ if (name.equals("innerHTML"))
+ {
+ /*
+ MXMLStringNode stringNode = (MXMLStringNode)propNode.getChild(0);
+ MXMLLiteralNode valueNode = (MXMLLiteralNode)stringNode.getChild(0);
+ String tagAsString = ((MXMLTagData)childTag).stringify();
+ String currentString = (String)valueNode.getValue();
+ MXMLLiteralNode newValueNode = new MXMLLiteralNode(stringNode,
+ currentString + tagAsString);
+ IMXMLNode[] newChildren = new IMXMLNode[1];
+ newChildren[0] = newValueNode;
+ stringNode.setChildren(newChildren);
+ stringNode.setExpressionNode(newValueNode);
+ */
+ SourceFragment[] sourceFragments = new SourceFragment[1];
+ String tagAsString = ((MXMLTagData)childTag).stringify();
+ SourceFragment sourceFragment = new SourceFragment(tagAsString, tagAsString, childTag.getLocationOfChildUnits());
+ sourceFragments[0] = sourceFragment;
+ info.addSourceFragments(childTag.getSourcePath(), sourceFragments);
+ }
+ }
+ }
+ else
+ {
+ childNode = createSpecifierNode(builder, "innerHTML");
+ if (childNode != null)
+ {
+ childNode.setSuffix(builder, childTag.getStateName());
+ String tagAsString = ((MXMLTagData)childTag).stringify();
+ String tagAsCData = IMXMLCoreConstants.cDataStart + tagAsString + IMXMLCoreConstants.cDataEnd;
+ MXMLToken token = new MXMLToken(MXMLTokenTypes.TOKEN_CDATA,
+ childTag.getStart(), childTag.getEnd(),
+ childTag.getLine(), childTag.getColumn(),
+ tagAsCData);
+ MXMLTextData text = new MXMLTextData(token);
+ text.setSourceLocation(childTag.getLocationOfChildUnits());
+ childNode.initializeFromText(builder, text, info);
+ info.addChildNode(childNode);
+ }
+ }
+ return;
+ }
+ }
+ }
// Handle child tags that are something other than property/style/event tags
// or instance tags.
@@ -541,6 +614,13 @@
String defaultPropertyName = classReference.getDefaultPropertyName(project);
if (defaultPropertyName != null)
{
+ if (defaultPropertyName.contains("|"))
+ {
+ int c = defaultPropertyName.indexOf("|");
+ String alt = defaultPropertyName.substring(c + 1);
+ defaultPropertyName = defaultPropertyName.substring(0, c);
+ altDefaultPropertyDefinition = (IVariableDefinition)project.resolveSpecifier(classReference, alt);
+ }
defaultPropertyDefinition =
(IVariableDefinition)project.resolveSpecifier(classReference, defaultPropertyName);
}
@@ -651,6 +731,16 @@
info.addChildNode(childNode);
}
}
+ else if (altDefaultPropertyDefinition != null && altDefaultPropertyDefinition.getTypeAsDisplayString().equals(IASLanguageConstants.String))
+ {
+ MXMLSpecifierNodeBase childNode =
+ createSpecifierNode(builder, altDefaultPropertyDefinition.getBaseName());
+ if (childNode != null)
+ {
+ childNode.initializeFromText(builder, text, info);
+ info.addChildNode(childNode);
+ }
+ }
else
{
super.processChildNonWhitespaceUnit(builder, tag, text, info);
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLExpressionNodeBase.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLExpressionNodeBase.java
index 6a114a5..1bb26bc 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLExpressionNodeBase.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLExpressionNodeBase.java
@@ -90,7 +90,7 @@
return expressionNode;
}
- void setExpressionNode(NodeBase value)
+ public void setExpressionNode(NodeBase value)
{
this.expressionNode = value;
if (value != null)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLTreeBuilder.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLTreeBuilder.java
index 877375b..08b47fc 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLTreeBuilder.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLTreeBuilder.java
@@ -457,6 +457,8 @@
Object defaultValue)
{
String text = SourceFragmentsReader.concatLogicalText(fragments);
+ if (propertyNode != null && propertyNode.getName().equals("innerHTML"))
+ text = SourceFragmentsReader.concatPhysicalText(fragments);
Object value = mxmlDialect.isWhitespace(text) ?
defaultValue :
diff --git a/compiler/src/test/java/aa/AAAMavenTestExternc.java b/compiler/src/test/java/aa/AAAMavenTestExternc.java
new file mode 100644
index 0000000..66b1e60
--- /dev/null
+++ b/compiler/src/test/java/aa/AAAMavenTestExternc.java
@@ -0,0 +1,84 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+package aa;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.royale.compiler.clients.COMPC;
+import org.apache.royale.compiler.clients.EXTERNC;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.swf.io.SWFDump;
+import org.apache.royale.utils.ITestAdapter;
+import org.apache.royale.utils.TestAdapterFactory;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.*;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import org.junit.Test;
+
+/**
+ * Base class for AS feature tests which compile AS code with MXMLC and run it in the standalone Flash Player.
+ * Copied and modified from MXMLFeatureTestsBase.java
+ */
+public class AAAMavenTestExternc
+{
+ private static boolean generateResultFile = false;
+
+ public AAAMavenTestExternc()
+ {
+ }
+
+ @Test
+ public void AAMavenTestSWCs_AA_JS_EXTERNC()
+ {
+ // Write the MXML into a temp file.
+ ITestAdapter testAdapter = TestAdapterFactory.getTestAdapter();
+
+ File externcDir = new File(testAdapter.getUnitTestBaseDir(), "../../../compiler-externc");
+
+ String[] args = new String[1];
+ args[0] = "-load-config+=" + new File(externcDir, "src/test/config/externc-config.xml").getAbsolutePath();
+ // Run the COMPC client with the specified command line.
+ EXTERNC externc = new EXTERNC();
+ externc._mainNoExit(args);
+
+ // Check that the SWC compiled cleanly.
+ List<ICompilerProblem> problems = new ArrayList<ICompilerProblem>();
+ for (ICompilerProblem problem : externc.problems.getFilteredProblems())
+ {
+ problems.add(problem);
+ }
+ assertThat(problems.size(), is(0));
+ }
+}
+
diff --git a/compiler/src/test/java/aa/AAMavenTestSWCs.java b/compiler/src/test/java/aa/AAMavenTestSWCs.java
index 5018e3d..0475b5d 100644
--- a/compiler/src/test/java/aa/AAMavenTestSWCs.java
+++ b/compiler/src/test/java/aa/AAMavenTestSWCs.java
@@ -85,29 +85,6 @@
}
@Test
- public void AAMavenTestSWCs_AA_JS_EXTERNC()
- {
- // Write the MXML into a temp file.
- ITestAdapter testAdapter = TestAdapterFactory.getTestAdapter();
-
- File externcDir = new File(testAdapter.getUnitTestBaseDir(), "../../../compiler-externc");
-
- String[] args = new String[1];
- args[0] = "-load-config+=" + new File(externcDir, "src/test/config/externc-config.xml").getAbsolutePath();
- // Run the COMPC client with the specified command line.
- EXTERNC externc = new EXTERNC();
- externc._mainNoExit(args);
-
- // Check that the SWC compiled cleanly.
- List<ICompilerProblem> problems = new ArrayList<ICompilerProblem>();
- for (ICompilerProblem problem : externc.problems.getFilteredProblems())
- {
- problems.add(problem);
- }
- assertThat(problems.size(), is(0));
- }
-
- @Test
public void AAMavenTestSWCs_AB_JS_SWC()
{
// Write the MXML into a temp file.
diff --git a/debugger/pom.xml b/debugger/pom.xml
index cffbf2a..3d6a9d3 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>debugger</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Royale: Compiler: Debugger</name>
@@ -82,12 +82,12 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>swfutils</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_da.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_da.properties
index a8a07c6..4afe1bb 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_da.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_da.properties
@@ -28,7 +28,7 @@
defaultBuildName=development
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Afspilleren reagerede ikke som forventet p\u00e5 kommandoen; kommandoen er afbrudt.
notSuspendedException=Kommandoen kan ikke afgives mens afspilleren k\u00f8rer
illegalStateException=Kommandoen fungerer ikke uden for en session.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_de.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_de.properties
index 4015eda..00ab397 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_de.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_de.properties
@@ -28,7 +28,7 @@
defaultBuildName=development
about=Apache fdb (Flash Player Debugger) [Build ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Der Player hat nicht wie erwartet auf den Befehl reagiert; der Befehl wird abgebrochen.
notSuspendedException=Der Befehl kann nicht ausgestellt werden, w\u00e4hrend der Player ausgef\u00fchrt wird
illegalStateException=Der Befehl ist ohne Sitzung nicht zul\u00e4ssig.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_en.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_en.properties
index 4635cd0..7a0f219 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_en.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_en.properties
@@ -28,7 +28,7 @@
defaultBuildName=development
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Player did not respond to the command as expected; command aborted.
notSuspendedException=Command cannot be issued while Player is running
illegalStateException=Command not valid without a session.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_es.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_es.properties
index 9265038..ca0096a 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_es.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_es.properties
@@ -28,7 +28,7 @@
defaultBuildName=desarrollo
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=El reproductor no respondi\u00f3 al comando como se esperaba; se cancel\u00f3 el comando.
notSuspendedException=No puede emitirse el comando mientras el reproductor se est\u00e1 ejecutando.
illegalStateException=El comando no es v\u00e1lido sin una sesi\u00f3n.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_fi.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_fi.properties
index 83c685a..573ada1 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_fi.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_fi.properties
@@ -28,7 +28,7 @@
defaultBuildName=kehitys
about=Apache fdb (Flash Player Debugger) [versio ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Soitin ei vastannut komentoon odotetulla tavalla. Komento keskeytettiin.
notSuspendedException=Komentoa ei voi antaa, kun soitin on k\u00e4ynniss\u00e4
illegalStateException=Komento ei kelpaa ilman istuntoa.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_fr.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_fr.properties
index bfaedd2..1af9c1c 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_fr.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_fr.properties
@@ -28,7 +28,7 @@
defaultBuildName=d\u00e9veloppement
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Le lecteur n'a pas r\u00e9pondu \u00e0 la commande comme pr\u00e9vu ; commande annul\u00e9e.
notSuspendedException=Impossible d'\u00e9mettre la commande lorsque le lecteur est en cours d'ex\u00e9cution
illegalStateException=Commande incorrecte sans session.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_it.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_it.properties
index 1860937..75877fd 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_it.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_it.properties
@@ -28,7 +28,7 @@
defaultBuildName=sviluppo
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Player non ha risposto al comando come previsto. Comando terminato.
notSuspendedException=Impossibile inviare il comando mentre Player \u00e8 in esecuzione
illegalStateException=Comando non valido senza una sessione.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ja.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ja.properties
index 45381f5..db44234 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ja.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ja.properties
@@ -28,7 +28,7 @@
defaultBuildName=development
about=Apache fdb (Flash Player Debugger) [\u30d3\u30eb\u30c9 ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Player \u304c\u30b3\u30de\u30f3\u30c9\u306b\u5bfe\u3057\u3066\u4e88\u671f\u3055\u308c\u305f\u5fdc\u7b54\u3092\u3057\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u30b3\u30de\u30f3\u30c9\u51e6\u7406\u306f\u4e2d\u6b62\u3055\u308c\u307e\u3057\u305f\u3002
notSuspendedException=Player \u306e\u5b9f\u884c\u4e2d\u306b\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
illegalStateException=\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u78ba\u7acb\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u3001\u30b3\u30de\u30f3\u30c9\u306f\u7121\u52b9\u3067\u3059\u3002
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ko.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ko.properties
index eec05cf..128c25d 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ko.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ko.properties
@@ -28,7 +28,7 @@
defaultBuildName=\uac1c\ubc1c
about=Apache fdb(Flash Player Debugger) [\ube4c\ub4dc ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=\ud50c\ub808\uc774\uc5b4\uac00 \uc608\uc0c1\ub300\ub85c \uba85\ub839\uc5d0 \uc751\ub2f5\ud558\uc9c0 \uc54a\uc544 \uba85\ub839\uc774 \uc911\ub2e8\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
notSuspendedException=\ud50c\ub808\uc774\uc5b4 \uc2e4\ud589 \uc911\uc5d0 \uba85\ub839\uc744 \uc218\ud589\ud560 \uc218 \uc5c6\uc74c
illegalStateException=\uc138\uc158\uc774 \uc5c6\uc73c\uba74 \uba85\ub839\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_nb.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_nb.properties
index 6fe465a..04fbda8 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_nb.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_nb.properties
@@ -28,7 +28,7 @@
defaultBuildName=utvikling
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Spilleren reagerte ikke som forventet p\u00e5 kommandoen. Kommando ble avbrutt.
notSuspendedException=Kommandoen kan ikke gis mens spilleren kj\u00f8rer
illegalStateException=Kommandoen er ikke gyldig uten en \u00f8kt.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_nl.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_nl.properties
index 936e473..9818474 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_nl.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_nl.properties
@@ -28,7 +28,7 @@
defaultBuildName=ontwikkeling
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Player heeft op onverwachte wijze gereageerd op de opdracht; opdracht afgebroken.
notSuspendedException=Kan opdracht niet uitvoeren terwijl Player wordt uitgevoerd
illegalStateException=Opdracht niet geldig zonder sessie
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_pt.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_pt.properties
index bf8cfad..e21a3e7 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_pt.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_pt.properties
@@ -28,7 +28,7 @@
defaultBuildName=desenvolvimento
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=O Player n\u00e3o respondeu ao comando como esperado; comando anulado.
notSuspendedException=N\u00e3o \u00e9 poss\u00edvel emitir o comando enquanto o Player est\u00e1 em execu\u00e7\u00e3o
illegalStateException=Comando inv\u00e1lido sem uma sess\u00e3o.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ru.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ru.properties
index 1dfba74..e9f1cf5 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ru.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_ru.properties
@@ -28,7 +28,7 @@
defaultBuildName=\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u043a\u0430
about=Apache fdb (\u043e\u0442\u043b\u0430\u0434\u0447\u0438\u043a Flash Player) [\u0441\u0431\u043e\u0440\u043a\u0430 ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=\u041f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u043e\u0442\u0432\u0435\u0442\u0438\u043b \u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0443 \u043e\u0436\u0438\u0434\u0430\u0435\u043c\u044b\u043c \u043e\u0431\u0440\u0430\u0437\u043e\u043c; \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u043a\u043e\u043c\u0430\u043d\u0434\u044b \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e.
notSuspendedException=\u041a\u043e\u043c\u0430\u043d\u0434\u0443 \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0440\u0430\u0431\u043e\u0442\u044b \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044f
illegalStateException=\u041a\u043e\u043c\u0430\u043d\u0434\u0430 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u043e\u0439 \u0431\u0435\u0437 \u0441\u0435\u0430\u043d\u0441\u0430.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_sv.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_sv.properties
index e9f445b..c80a8a7 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_sv.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_sv.properties
@@ -28,7 +28,7 @@
defaultBuildName=utveckling
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Spelaren svarade inte p\u00e5 kommandot som f\u00f6rv\u00e4ntat. Kommandot har avbrutits.
notSuspendedException=Du kan inte ange kommandon n\u00e4r spelaren k\u00f6rs.
illegalStateException=Kommandot \u00e4r inte giltigt utan session.
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_zh_CN.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_zh_CN.properties
index 37451db..11920af 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_zh_CN.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_zh_CN.properties
@@ -28,7 +28,7 @@
defaultBuildName=\u5f00\u53d1
about=Apache fdb\uff08Flash Player \u8c03\u8bd5\u5668\uff09[\u5185\u90e8\u7248\u672c ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Player \u672a\u6309\u9884\u671f\u65b9\u5f0f\u54cd\u5e94\u547d\u4ee4\uff1b\u547d\u4ee4\u5df2\u5f02\u5e38\u7ec8\u6b62\u3002
notSuspendedException=Player \u5904\u4e8e\u8fd0\u884c\u72b6\u6001\u65f6\u65e0\u6cd5\u53d1\u51fa\u547d\u4ee4
illegalStateException=\u5982\u679c\u6ca1\u6709\u4f1a\u8bdd\uff0c\u5219\u547d\u4ee4\u65e0\u6548\u3002
diff --git a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_zh_TW.properties b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_zh_TW.properties
index f5d34e4..9b332d2 100644
--- a/debugger/src/main/resources/royale/tools/debugger/cli/fdb_zh_TW.properties
+++ b/debugger/src/main/resources/royale/tools/debugger/cli/fdb_zh_TW.properties
@@ -28,7 +28,7 @@
defaultBuildName=\u958b\u767c
about=Apache fdb (Flash Player \u9664\u932f\u7a0b\u5f0f) [\u7d44\u5efa ${build}]
-copyright=Copyright 2017 The Apache Software Foundation.
+copyright=Copyright 2018 The Apache Software Foundation.
noResponseException=Player \u672a\u5982\u9810\u671f\u56de\u61c9\u6307\u4ee4\uff1b\u6307\u4ee4\u5df2\u4e2d\u6b62\u3002
notSuspendedException=Player \u6b63\u5728\u57f7\u884c\u6642\u7121\u6cd5\u767c\u51fa\u6307\u4ee4
illegalStateException=\u5982\u679c\u6c92\u6709\u5de5\u4f5c\u968e\u6bb5\uff0c\u6307\u4ee4\u5c31\u7121\u6548\u3002
diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml
index 3a59cae..0b80f8f 100644
--- a/flex-compiler-oem/pom.xml
+++ b/flex-compiler-oem/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>flex-compiler-oem</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Royale: Compiler: OEM Layer</name>
@@ -35,17 +35,17 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-jx</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>swfutils</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index fd30acc..bf035c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,16 +28,16 @@
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Royale: Compiler: Parent</name>
<description>The Apache Royale Project</description>
<scm>
- <connection>scm:https://github.com/apache/royale-compiler.git</connection>
- <developerConnection>scm:https://github.com/apache/royale-compiler.git</developerConnection>
- <url>https://github.com/apache/royale-compiler</url>
+ <connection>scm:git:git@github.com:apache/royale-compiler.git</connection>
+ <developerConnection>scm:git:git@github.com:apache/royale-compiler.git</developerConnection>
+ <url>scm:git:git@github.com:apache/royale-compiler.git</url>
<tag>HEAD</tag>
</scm>
@@ -141,6 +141,7 @@
<plugin>
<groupId>net.sourceforge.jburg</groupId>
<artifactId>jburg-maven-plugin</artifactId>
+ <version>1.10.4</version>
<dependencies>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
diff --git a/royale-ant-tasks/pom.xml b/royale-ant-tasks/pom.xml
index 513b256..248ae1f 100644
--- a/royale-ant-tasks/pom.xml
+++ b/royale-ant-tasks/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>royale-ant-tasks</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Royale: Royale Ant Tasks</name>
diff --git a/royale-maven-plugin/pom.xml b/royale-maven-plugin/pom.xml
index cadbd21..c25f5d1 100644
--- a/royale-maven-plugin/pom.xml
+++ b/royale-maven-plugin/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>royale-maven-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Royale: Royale Maven Plugin</name>
diff --git a/swfutils/pom.xml b/swfutils/pom.xml
index d3a5d44..bac084f 100644
--- a/swfutils/pom.xml
+++ b/swfutils/pom.xml
@@ -17,18 +17,17 @@
limitations under the License.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>swfutils</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Royale: Compiler: SWFUtils</name>
<description>The Apache Royale Compiler SWF Utility classes</description>
