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.

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

Update versions after incompatible changes in versioning.util and mercurial #7230

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ide/bugtracking.bridge/manifest.mf
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.bugtracking.bridge
OpenIDE-Module-Layer: org/netbeans/modules/bugtracking/bridge/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugtracking/bridge/Bundle.properties
OpenIDE-Module-Specification-Version: 1.69
OpenIDE-Module-Specification-Version: 1.70
3 changes: 2 additions & 1 deletion ide/bugtracking.bridge/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.40</specification-version>
<release-version>2</release-version>
<specification-version>2.0.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ide/git/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ nbm.needs.restart=true

# #178009
# disable.qa-functional.tests=false
spec.version.base=1.46.0
spec.version.base=1.47.0

test.config.stable.includes=**/*Test.class

Expand Down
3 changes: 2 additions & 1 deletion ide/git/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.68.0.3</specification-version>
<release-version>2</release-version>
<specification-version>2.0.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ide/localhistory/manifest.mf
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.localhistory
OpenIDE-Module-Install: org/netbeans/modules/localhistory/ModuleLifecycleManager.class
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/localhistory/Bundle.properties
OpenIDE-Module-Specification-Version: 1.58
OpenIDE-Module-Specification-Version: 1.59
3 changes: 2 additions & 1 deletion ide/localhistory/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.45</specification-version>
<release-version>2</release-version>
<specification-version>2.0.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ide/mercurial/manifest.mf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.mercurial
OpenIDE-Module: org.netbeans.modules.mercurial/2
OpenIDE-Module-Layer: org/netbeans/modules/mercurial/resources/hg-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/mercurial/Bundle.properties
OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help
2 changes: 1 addition & 1 deletion ide/mercurial/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ javac.source=1.8
nbm.homepage=http://wiki.netbeans.org/wiki/view/MercurialVersionControl
nbm.module.author=John Rice and Padraig O'Briain
nbm.needs.restart=true
spec.version.base=2.0.0
spec.version.base=2.0.1

#qa-functional
test.qa-functional.cp.extra=${openide.nodes.dir}/modules/org-openide-nodes.jar:\${openide.util.dir}/lib/org-openide-util.jar:${openide.util.ui.dir}/lib/org-openide-util-ui.jar
Expand Down
3 changes: 2 additions & 1 deletion ide/mercurial/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.68.0.3</specification-version>
<release-version>2</release-version>
<specification-version>2.0.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ide/subversion/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
spec.version.base=1.65.0
spec.version.base=1.66.0

javac.compilerargs=-Xlint:unchecked
javac.source=1.8
Expand Down
3 changes: 2 additions & 1 deletion ide/subversion/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.68.0.3</specification-version>
<release-version>2</release-version>
<specification-version>2.0.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ide/team.ide/manifest.mf
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.team.ide
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/team/ide/Bundle.properties
OpenIDE-Module-Specification-Version: 1.37
OpenIDE-Module-Specification-Version: 1.38
3 changes: 2 additions & 1 deletion ide/team.ide/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.40</specification-version>
<release-version>2</release-version>
<specification-version>2.0.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ide/versioning.indexingbridge/manifest.mf
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.versioning.indexingbridge/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/versioning/indexingbridge/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.versioning.indexingbridge
OpenIDE-Module-Specification-Version: 1.49
OpenIDE-Module-Specification-Version: 1.50

3 changes: 2 additions & 1 deletion ide/versioning.indexingbridge/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.7</specification-version>
<release-version>2</release-version>
<specification-version>2.0.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ide/versioning.ui/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ is.eager=true
javac.compilerargs=-Xlint:unchecked
javac.source=1.8

spec.version.base=1.46.0
spec.version.base=1.47.0
3 changes: 2 additions & 1 deletion ide/versioning.ui/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.68.0.2</specification-version>
<release-version>2</release-version>
<specification-version>2.0.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ide/versioning.util/manifest.mf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.versioning.util
OpenIDE-Module: org.netbeans.modules.versioning.util/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/versioning/util/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/versioning/util/resources/layer.xml
OpenIDE-Module-Recommends: org.netbeans.modules.versioning.indexingbridge
2 changes: 1 addition & 1 deletion ide/versioning.util/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ javac.source=11
javac.target=11

javadoc.name=Versioning Support Utilities
spec.version.base=2.0.0
spec.version.base=2.0.1
is.autoload=true

# Fatal error: Fatal error: class javax.net.SocketFactory not found
Expand Down
Loading