Skip to content

Commit

Permalink
CARROT-1083: require Java 1.7 (follow up).
Browse files Browse the repository at this point in the history
  • Loading branch information
dweiss committed Feb 28, 2015
1 parent e460a70 commit 5e2edd5
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion applications/carrot2-cli/etc/readme.txt
Expand Up @@ -9,7 +9,7 @@ batch.cmd input (on Windows)

and look for the "output" directory for the results. Run the script without parameters
to see the available switches. The CLI applications require a Java Runtime Environment
(JRE) version 1.6.0 or later.
(JRE) version 1.7.0 or later.


For more information, please refer to Carrot2 Manual:
Expand Down
2 changes: 1 addition & 1 deletion applications/carrot2-dcs/etc/distribution/readme.txt
Expand Up @@ -6,7 +6,7 @@ service. It can cluster documents from an external source (e.g., a search
engine) or documents provided directly as an XML stream. Results are returned
in XML or JSON formats.

The DCS requires a Java Runtime Environment (JRE) version 1.6.0 or later. To
The DCS requires a Java Runtime Environment (JRE) version 1.7.0 or later. To
run the DCS, execute the 'dcs' script and point your browser at
http://localhost:8080 for further instructions.

Expand Down
4 changes: 2 additions & 2 deletions applications/carrot2-dcs/examples/java/pom.xml
Expand Up @@ -11,8 +11,8 @@
<!-- Global properties. -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion applications/carrot2-examples/etc/readme.txt
Expand Up @@ -2,7 +2,7 @@ Carrot2 Java API
----------------

Carrot2 Java API lets you embed Carrot2 clustering in your Java software.
The API requires a Java Development Kit (JDK) version 1.6.0 or later.
The API requires a Java Development Kit (JDK) version 1.7.0 or later.

See the examples/ directory for a number of copy-paste examples.

Expand Down
4 changes: 2 additions & 2 deletions applications/carrot2-examples/pom.xml
Expand Up @@ -14,8 +14,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<attributes.processor.version>1.0.1</attributes.processor.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion doc/docbook/advanced-topics.xml
Expand Up @@ -106,7 +106,7 @@

<para>
To build &C2; applications from source code, you will need Java Software Development
Kit (Java SDK) version 1.6 or higher and Apache Ant version 1.7.1 or higher.
Kit (Java SDK) version 1.7 or higher and Apache Ant version 1.7.1 or higher.
You can chcek out the latest &C2; source code using git:
</para>

Expand Down
6 changes: 3 additions & 3 deletions doc/docbook/application-suite.xml
Expand Up @@ -190,7 +190,7 @@

<orderedlist>
<listitem>
<para>Download and install <link xlink:href="http://java.sun.com/javase/downloads/index.jsp">Java Runtime Environment</link> (version 1.6.0 or newer) if you have not done so.</para>
<para>Download and install <link xlink:href="http://java.sun.com/javase/downloads/index.jsp">Java Runtime Environment</link> (version 1.7.0 or newer) if you have not done so.</para>
</listitem>

<listitem role="private">
Expand Down Expand Up @@ -333,7 +333,7 @@

<orderedlist>
<listitem>
<para>Download and install <link xlink:href="http://java.sun.com/javase/downloads/index.jsp">Java Runtime Environment</link> (version 1.6.0 or newer) if you have not done so.</para>
<para>Download and install <link xlink:href="http://java.sun.com/javase/downloads/index.jsp">Java Runtime Environment</link> (version 1.7.0 or newer) if you have not done so.</para>
</listitem>

<listitem role="private">
Expand Down Expand Up @@ -490,7 +490,7 @@

<orderedlist>
<listitem>
<para>Download and install <link xlink:href="http://java.sun.com/javase/downloads/index.jsp">Java Runtime Environment</link> (version 1.6.0 or newer) if you have not done so.</para>
<para>Download and install <link xlink:href="http://java.sun.com/javase/downloads/index.jsp">Java Runtime Environment</link> (version 1.7.0 or newer) if you have not done so.</para>
</listitem>

<listitem role="private">
Expand Down
2 changes: 1 addition & 1 deletion doc/docbook/getting-started.xml
Expand Up @@ -23,7 +23,7 @@

<para>
All &PROD; applications require <link xlink:href="http://java.sun.com/javase/downloads/index.jsp">Java Runtime Environment</link>
version 1.6.0 or later. The &DCW; is distributed for Windows,
version 1.7.0 or later. The &DCW; is distributed for Windows,
Linux 32-bit and 64-bit versions and Mac OS x86.
</para>

Expand Down
6 changes: 3 additions & 3 deletions etc/eclipse/all-preferences.epf
Expand Up @@ -16,7 +16,7 @@
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.6
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.7
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.overrideannotation=true
Expand Down Expand Up @@ -103,7 +103,7 @@
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.6
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.7
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
Expand Down Expand Up @@ -327,7 +327,7 @@ file_export_version=3.0
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_empty_lines=false
Expand Down
4 changes: 2 additions & 2 deletions lib/org.carrot2.antlib/pom.xml
Expand Up @@ -35,8 +35,8 @@
<!-- Global properties. -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>

<!-- Dependencies. -->
Expand Down
5 changes: 2 additions & 3 deletions workbench/build-conf/build.properties
Expand Up @@ -124,9 +124,8 @@ javacVerbose=false
compilerArg=-nowarn -s ${workbench.build.dir}/apt_generated

# Default value for the version of the source code. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacSource in build.properties
javacSource=1.6
javacSource=1.7

# Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties.
javacTarget=1.6

javacTarget=1.7

2 changes: 1 addition & 1 deletion workbench/org.carrot2.workbench.feature/readme.txt
Expand Up @@ -5,7 +5,7 @@ Carrot2 Document Clustering Workbench (DCW) is a standalone GUI application
you can use to experiment with Carrot2 clustering on data from common search
engines or your own data.

The DCW requires a Java Runtime Environment (JRE) version 1.6.0 or later. To
The DCW requires a Java Runtime Environment (JRE) version 1.7.0 or later. To
start the DCW, run carrot2-workbench.exe (Windows) or carrot2-workbench
(Linux).

Expand Down

0 comments on commit 5e2edd5

Please sign in to comment.